Skip to content

DataViews: Add density option to table layout #67170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ntsekouras merged 7 commits into from
Nov 25, 2024
Merged

DataViews: Add density option to table layout #67170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
12f6740
DataViews: Add density option to `table` layout
ntsekouras Nov 20, 2024
33863e4
rename PreviewSizePicker
ntsekouras Nov 21, 2024
e3e6352
rename var
ntsekouras Nov 21, 2024
c08fa7f
rename to `previewSize`
ntsekouras Nov 21, 2024
e41a211
do not update `view` on viewport change
ntsekouras Nov 25, 2024
2f533b8
Adjust spacing
jameskoster Nov 25, 2024
e657fc8
Fix bugs
jameskoster Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
do not update view on viewport change
  • Loading branch information
@ntsekouras
ntsekouras committed Nov 25, 2024
commit e41a211d83d102707e83b4d2f2e2207ecf5a2649
9 changes: 5 additions & 4 deletions packages/dataviews/src/dataviews-layouts/grid/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { useHasAPossibleBulkAction } from '../../components/dataviews-bulk-actio
import type { Action, NormalizedField, ViewGridProps } from '../../types';
import type { SetSelection } from '../../private-types';
import getClickableItemProps from '../utils/get-clickable-item-props';
import { useChangePreviewSizeOnViewportChange } from './preview-size-picker';
import { useUpdatedPreviewSizeOnViewportChange } from './preview-size-picker';

interface GridItemProps< Item > {
selection: string[];
Expand Down Expand Up @@ -194,7 +194,6 @@ export default function ViewGrid< Item >( {
selection,
view,
}: ViewGridProps< Item > ) {
useChangePreviewSizeOnViewportChange();
const mediaField = fields.find(
( field ) => field.id === view.layout?.mediaField
);
Expand Down Expand Up @@ -224,9 +223,11 @@ export default function ViewGrid< Item >( {
{ visibleFields: [], badgeFields: [] }
);
const hasData = !! data?.length;
const gridStyle = view.layout?.previewSize
const updatedPreviewSize = useUpdatedPreviewSizeOnViewportChange();
const usedPreviewSize = updatedPreviewSize || view.layout?.previewSize;
const gridStyle = usedPreviewSize
? {
gridTemplateColumns: `repeat(${ view.layout.previewSize }, minmax(0, 1fr))`,
gridTemplateColumns: `repeat(${ usedPreviewSize }, minmax(0, 1fr))`,
}
: {};
return (
Expand Down
21 changes: 6 additions & 15 deletions packages/dataviews/src/dataviews-layouts/grid/preview-size-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { RangeControl } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useViewportMatch } from '@wordpress/compose';
import { useEffect, useMemo, useContext } from '@wordpress/element';
import { useMemo, useContext } from '@wordpress/element';

/**
* Internal dependencies
Expand Down Expand Up @@ -45,11 +45,10 @@ function useViewPortBreakpoint() {
return null;
}

export function useChangePreviewSizeOnViewportChange() {
export function useUpdatedPreviewSizeOnViewportChange() {
const viewport = useViewPortBreakpoint();
const context = useContext( DataViewsContext );
const view = context.view as ViewGrid;
useEffect( () => {
const view = useContext( DataViewsContext ).view as ViewGrid;
return useMemo( () => {
const previewSize = view.layout?.previewSize;
let newPreviewSize;
if ( ! viewport || ! previewSize ) {
Expand All @@ -62,16 +61,8 @@ export function useChangePreviewSizeOnViewportChange() {
if ( previewSize > breakValues.max ) {
newPreviewSize = breakValues.max;
}
Comment thread
ntsekouras marked this conversation as resolved.
if ( newPreviewSize ) {
context.onChangeView( {
...view,
layout: {
...view.layout,
previewSize: newPreviewSize,
},
} );
}
}, [ viewport, view, context ] );
return newPreviewSize;
}, [ viewport, view ] );
}

export default function PreviewSizePicker() {
Expand Down