From c841a64c1f09dfe636a32eb902cde32c3ec1b622 Mon Sep 17 00:00:00 2001 From: James Koster Date: Tue, 28 Nov 2023 16:24:39 +0000 Subject: [PATCH 1/2] Align data view icon usage --- .../edit-site/src/components/dataviews/view-actions.js | 10 +++++++--- .../src/components/sidebar-dataviews/dataview-item.js | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/edit-site/src/components/dataviews/view-actions.js b/packages/edit-site/src/components/dataviews/view-actions.js index bcc63c04117d76..acb2035e22b0fc 100644 --- a/packages/edit-site/src/components/dataviews/view-actions.js +++ b/packages/edit-site/src/components/dataviews/view-actions.js @@ -9,10 +9,10 @@ import { import { chevronRightSmall, check, - blockTable, + list, arrowUp, arrowDown, - grid, + category, columns, } from '@wordpress/icons'; import { __ } from '@wordpress/i18n'; @@ -275,7 +275,11 @@ function SortMenu( { fields, view, onChangeView } ) { ); } -const VIEW_TYPE_ICONS = { list: blockTable, grid, 'side-by-side': columns }; +const VIEW_TYPE_ICONS = { + list, + grid: category, + 'side-by-side': columns, +}; export default function ViewActions( { fields, diff --git a/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js b/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js index c6d7bbe4a231ba..220e5b60243d5b 100644 --- a/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js +++ b/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js @@ -6,7 +6,7 @@ import classnames from 'classnames'; /** * WordPress dependencies */ -import { page, columns, pullRight } from '@wordpress/icons'; +import { list, category, columns } from '@wordpress/icons'; import { privateApis as routerPrivateApis } from '@wordpress/router'; import { __experimentalHStack as HStack } from '@wordpress/components'; @@ -19,7 +19,7 @@ import { unlock } from '../../lock-unlock'; const { useLocation } = unlock( routerPrivateApis ); function getDataViewIcon( type ) { - const icons = { list: page, grid: columns, 'side-by-side': pullRight }; + const icons = { list, grid: category, 'side-by-side': columns }; return icons[ type ]; } From 70c96605365117d22af762f7d904ec5967c772c8 Mon Sep 17 00:00:00 2001 From: James Koster Date: Thu, 30 Nov 2023 11:18:35 +0000 Subject: [PATCH 2/2] Use formatListBullets for lists --- .../edit-site/src/components/dataviews/view-actions.js | 4 ++-- .../src/components/sidebar-dataviews/dataview-item.js | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/edit-site/src/components/dataviews/view-actions.js b/packages/edit-site/src/components/dataviews/view-actions.js index acb2035e22b0fc..8632721dc23b2a 100644 --- a/packages/edit-site/src/components/dataviews/view-actions.js +++ b/packages/edit-site/src/components/dataviews/view-actions.js @@ -9,7 +9,7 @@ import { import { chevronRightSmall, check, - list, + formatListBullets, arrowUp, arrowDown, category, @@ -276,7 +276,7 @@ function SortMenu( { fields, view, onChangeView } ) { } const VIEW_TYPE_ICONS = { - list, + list: formatListBullets, grid: category, 'side-by-side': columns, }; diff --git a/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js b/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js index 220e5b60243d5b..e4e7f1f3b96ed2 100644 --- a/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js +++ b/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js @@ -6,7 +6,7 @@ import classnames from 'classnames'; /** * WordPress dependencies */ -import { list, category, columns } from '@wordpress/icons'; +import { formatListBullets, category, drawerLeft } from '@wordpress/icons'; import { privateApis as routerPrivateApis } from '@wordpress/router'; import { __experimentalHStack as HStack } from '@wordpress/components'; @@ -19,7 +19,11 @@ import { unlock } from '../../lock-unlock'; const { useLocation } = unlock( routerPrivateApis ); function getDataViewIcon( type ) { - const icons = { list, grid: category, 'side-by-side': columns }; + const icons = { + list: formatListBullets, + grid: category, + 'side-by-side': drawerLeft, + }; return icons[ type ]; }