From d7985a453029b8636a63caf5faa32af6996dd32e Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 17:08:20 +0100 Subject: [PATCH 01/14] Move `Toolbar` files inside `toolbar` subfolder --- packages/components/src/toolbar/stories/index.js | 4 ++-- packages/components/src/toolbar/{ => toolbar}/README.md | 0 packages/components/src/toolbar/{ => toolbar}/index.js | 2 +- .../components/src/toolbar/{ => toolbar}/style.native.scss | 0 packages/components/src/toolbar/{ => toolbar}/style.scss | 0 .../components/src/toolbar/{ => toolbar}/toolbar-container.js | 0 .../src/toolbar/{ => toolbar}/toolbar-container.native.js | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename packages/components/src/toolbar/{ => toolbar}/README.md (100%) rename packages/components/src/toolbar/{ => toolbar}/index.js (96%) rename packages/components/src/toolbar/{ => toolbar}/style.native.scss (100%) rename packages/components/src/toolbar/{ => toolbar}/style.scss (100%) rename packages/components/src/toolbar/{ => toolbar}/toolbar-container.js (100%) rename packages/components/src/toolbar/{ => toolbar}/toolbar-container.native.js (100%) diff --git a/packages/components/src/toolbar/stories/index.js b/packages/components/src/toolbar/stories/index.js index 298cd97a8674ab..bfd89ab5933c2f 100644 --- a/packages/components/src/toolbar/stories/index.js +++ b/packages/components/src/toolbar/stories/index.js @@ -17,7 +17,7 @@ import { /** * Internal dependencies */ -import Toolbar from '../'; +import Toolbar from '..'; import { SVG, Path, @@ -25,7 +25,7 @@ import { ToolbarGroup, ToolbarItem, DropdownMenu, -} from '../../'; +} from '../../..'; export default { title: 'Components/Toolbar', component: Toolbar }; diff --git a/packages/components/src/toolbar/README.md b/packages/components/src/toolbar/toolbar/README.md similarity index 100% rename from packages/components/src/toolbar/README.md rename to packages/components/src/toolbar/toolbar/README.md diff --git a/packages/components/src/toolbar/index.js b/packages/components/src/toolbar/toolbar/index.js similarity index 96% rename from packages/components/src/toolbar/index.js rename to packages/components/src/toolbar/toolbar/index.js index f798e3c3776a9f..c5aeb27efbe870 100644 --- a/packages/components/src/toolbar/index.js +++ b/packages/components/src/toolbar/toolbar/index.js @@ -12,7 +12,7 @@ import deprecated from '@wordpress/deprecated'; /** * Internal dependencies */ -import ToolbarGroup from '../toolbar-group'; +import ToolbarGroup from '../../toolbar-group'; import ToolbarContainer from './toolbar-container'; /** diff --git a/packages/components/src/toolbar/style.native.scss b/packages/components/src/toolbar/toolbar/style.native.scss similarity index 100% rename from packages/components/src/toolbar/style.native.scss rename to packages/components/src/toolbar/toolbar/style.native.scss diff --git a/packages/components/src/toolbar/style.scss b/packages/components/src/toolbar/toolbar/style.scss similarity index 100% rename from packages/components/src/toolbar/style.scss rename to packages/components/src/toolbar/toolbar/style.scss diff --git a/packages/components/src/toolbar/toolbar-container.js b/packages/components/src/toolbar/toolbar/toolbar-container.js similarity index 100% rename from packages/components/src/toolbar/toolbar-container.js rename to packages/components/src/toolbar/toolbar/toolbar-container.js diff --git a/packages/components/src/toolbar/toolbar-container.native.js b/packages/components/src/toolbar/toolbar/toolbar-container.native.js similarity index 100% rename from packages/components/src/toolbar/toolbar-container.native.js rename to packages/components/src/toolbar/toolbar/toolbar-container.native.js From 2e0e5d69b093d1d188567f01aa84afea0ad03278 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 17:15:05 +0100 Subject: [PATCH 02/14] Move `ToolbarButton` inside `toolbar-button` subfolder --- .../stories/index.js => toolbar/stories/toolbar-button.js} | 0 packages/components/src/{ => toolbar}/toolbar-button/README.md | 0 packages/components/src/{ => toolbar}/toolbar-button/index.js | 0 packages/components/src/{ => toolbar}/toolbar-button/style.scss | 0 .../src/{ => toolbar}/toolbar-button/toolbar-button-container.js | 0 .../toolbar-button/toolbar-button-container.native.js | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename packages/components/src/{toolbar-button/stories/index.js => toolbar/stories/toolbar-button.js} (100%) rename packages/components/src/{ => toolbar}/toolbar-button/README.md (100%) rename packages/components/src/{ => toolbar}/toolbar-button/index.js (100%) rename packages/components/src/{ => toolbar}/toolbar-button/style.scss (100%) rename packages/components/src/{ => toolbar}/toolbar-button/toolbar-button-container.js (100%) rename packages/components/src/{ => toolbar}/toolbar-button/toolbar-button-container.native.js (100%) diff --git a/packages/components/src/toolbar-button/stories/index.js b/packages/components/src/toolbar/stories/toolbar-button.js similarity index 100% rename from packages/components/src/toolbar-button/stories/index.js rename to packages/components/src/toolbar/stories/toolbar-button.js diff --git a/packages/components/src/toolbar-button/README.md b/packages/components/src/toolbar/toolbar-button/README.md similarity index 100% rename from packages/components/src/toolbar-button/README.md rename to packages/components/src/toolbar/toolbar-button/README.md diff --git a/packages/components/src/toolbar-button/index.js b/packages/components/src/toolbar/toolbar-button/index.js similarity index 100% rename from packages/components/src/toolbar-button/index.js rename to packages/components/src/toolbar/toolbar-button/index.js diff --git a/packages/components/src/toolbar-button/style.scss b/packages/components/src/toolbar/toolbar-button/style.scss similarity index 100% rename from packages/components/src/toolbar-button/style.scss rename to packages/components/src/toolbar/toolbar-button/style.scss diff --git a/packages/components/src/toolbar-button/toolbar-button-container.js b/packages/components/src/toolbar/toolbar-button/toolbar-button-container.js similarity index 100% rename from packages/components/src/toolbar-button/toolbar-button-container.js rename to packages/components/src/toolbar/toolbar-button/toolbar-button-container.js diff --git a/packages/components/src/toolbar-button/toolbar-button-container.native.js b/packages/components/src/toolbar/toolbar-button/toolbar-button-container.native.js similarity index 100% rename from packages/components/src/toolbar-button/toolbar-button-container.native.js rename to packages/components/src/toolbar/toolbar-button/toolbar-button-container.native.js From b63fa2a85b011ed648cc2a292ef3db2f1d817dee Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 17:19:28 +0100 Subject: [PATCH 03/14] Move `ToolbarContext` inside `toolbar-context` subfolder --- packages/components/src/{ => toolbar}/toolbar-context/index.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/components/src/{ => toolbar}/toolbar-context/index.js (100%) diff --git a/packages/components/src/toolbar-context/index.js b/packages/components/src/toolbar/toolbar-context/index.js similarity index 100% rename from packages/components/src/toolbar-context/index.js rename to packages/components/src/toolbar/toolbar-context/index.js From 7531757789893e6a07281c7460bf276c2ae981cd Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 17:25:01 +0100 Subject: [PATCH 04/14] Move `ToolbarDropdownMenu` inside `toolbar-dropdown-menu` subfolder --- .../src/{ => toolbar}/toolbar-dropdown-menu/README.md | 0 .../src/{ => toolbar}/toolbar-dropdown-menu/index.js | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename packages/components/src/{ => toolbar}/toolbar-dropdown-menu/README.md (100%) rename packages/components/src/{ => toolbar}/toolbar-dropdown-menu/index.js (90%) diff --git a/packages/components/src/toolbar-dropdown-menu/README.md b/packages/components/src/toolbar/toolbar-dropdown-menu/README.md similarity index 100% rename from packages/components/src/toolbar-dropdown-menu/README.md rename to packages/components/src/toolbar/toolbar-dropdown-menu/README.md diff --git a/packages/components/src/toolbar-dropdown-menu/index.js b/packages/components/src/toolbar/toolbar-dropdown-menu/index.js similarity index 90% rename from packages/components/src/toolbar-dropdown-menu/index.js rename to packages/components/src/toolbar/toolbar-dropdown-menu/index.js index 10b73757057bd2..a7e78a616cce26 100644 --- a/packages/components/src/toolbar-dropdown-menu/index.js +++ b/packages/components/src/toolbar/toolbar-dropdown-menu/index.js @@ -6,9 +6,9 @@ import { forwardRef, useContext } from '@wordpress/element'; /** * Internal dependencies */ -import ToolbarItem from '../toolbar-item'; +import ToolbarItem from '../../toolbar-item'; import ToolbarContext from '../toolbar-context'; -import DropdownMenu from '../dropdown-menu'; +import DropdownMenu from '../../dropdown-menu'; function ToolbarDropdownMenu( props, ref ) { const accessibleToolbarState = useContext( ToolbarContext ); From 7f1630ba95c97dc9d4632936b7c28c46476d0e75 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 17:31:05 +0100 Subject: [PATCH 05/14] Move `ToolbarGroup` inside `toolbar-group` subfolder --- .../stories/index.js => toolbar/stories/toolbar-group.js} | 2 +- .../test/index.js => toolbar/test/toolbar-group.js} | 2 +- packages/components/src/{ => toolbar}/toolbar-group/README.md | 0 packages/components/src/{ => toolbar}/toolbar-group/index.js | 0 .../src/{ => toolbar}/toolbar-group/style.native.scss | 0 .../components/src/{ => toolbar}/toolbar-group/style.scss | 0 .../{ => toolbar}/toolbar-group/toolbar-group-collapsed.js | 4 ++-- .../toolbar-group/toolbar-group-collapsed.native.js | 0 .../{ => toolbar}/toolbar-group/toolbar-group-container.js | 0 .../toolbar-group/toolbar-group-container.native.js | 0 packages/components/src/toolbar/toolbar/index.js | 2 +- 11 files changed, 5 insertions(+), 5 deletions(-) rename packages/components/src/{toolbar-group/stories/index.js => toolbar/stories/toolbar-group.js} (92%) rename packages/components/src/{toolbar-group/test/index.js => toolbar/test/toolbar-group.js} (98%) rename packages/components/src/{ => toolbar}/toolbar-group/README.md (100%) rename packages/components/src/{ => toolbar}/toolbar-group/index.js (100%) rename packages/components/src/{ => toolbar}/toolbar-group/style.native.scss (100%) rename packages/components/src/{ => toolbar}/toolbar-group/style.scss (100%) rename packages/components/src/{ => toolbar}/toolbar-group/toolbar-group-collapsed.js (89%) rename packages/components/src/{ => toolbar}/toolbar-group/toolbar-group-collapsed.native.js (100%) rename packages/components/src/{ => toolbar}/toolbar-group/toolbar-group-container.js (100%) rename packages/components/src/{ => toolbar}/toolbar-group/toolbar-group-container.native.js (100%) diff --git a/packages/components/src/toolbar-group/stories/index.js b/packages/components/src/toolbar/stories/toolbar-group.js similarity index 92% rename from packages/components/src/toolbar-group/stories/index.js rename to packages/components/src/toolbar/stories/toolbar-group.js index c24447be9dfab4..d967fc72a63e43 100644 --- a/packages/components/src/toolbar-group/stories/index.js +++ b/packages/components/src/toolbar/stories/toolbar-group.js @@ -6,7 +6,7 @@ import { formatBold, formatItalic, link } from '@wordpress/icons'; /** * Internal dependencies */ -import { ToolbarButton, ToolbarGroup } from '../../'; +import { ToolbarButton, ToolbarGroup } from '..'; export default { title: 'Components/ToolbarGroup', component: ToolbarGroup }; diff --git a/packages/components/src/toolbar-group/test/index.js b/packages/components/src/toolbar/test/toolbar-group.js similarity index 98% rename from packages/components/src/toolbar-group/test/index.js rename to packages/components/src/toolbar/test/toolbar-group.js index 4e521f6f8c4950..7a0317254a3eae 100644 --- a/packages/components/src/toolbar-group/test/index.js +++ b/packages/components/src/toolbar/test/toolbar-group.js @@ -6,7 +6,7 @@ import { fireEvent, render, screen } from '@testing-library/react'; /** * Internal dependencies */ -import ToolbarGroup from '../'; +import ToolbarGroup from '..'; describe( 'ToolbarGroup', () => { describe( 'basic rendering', () => { diff --git a/packages/components/src/toolbar-group/README.md b/packages/components/src/toolbar/toolbar-group/README.md similarity index 100% rename from packages/components/src/toolbar-group/README.md rename to packages/components/src/toolbar/toolbar-group/README.md diff --git a/packages/components/src/toolbar-group/index.js b/packages/components/src/toolbar/toolbar-group/index.js similarity index 100% rename from packages/components/src/toolbar-group/index.js rename to packages/components/src/toolbar/toolbar-group/index.js diff --git a/packages/components/src/toolbar-group/style.native.scss b/packages/components/src/toolbar/toolbar-group/style.native.scss similarity index 100% rename from packages/components/src/toolbar-group/style.native.scss rename to packages/components/src/toolbar/toolbar-group/style.native.scss diff --git a/packages/components/src/toolbar-group/style.scss b/packages/components/src/toolbar/toolbar-group/style.scss similarity index 100% rename from packages/components/src/toolbar-group/style.scss rename to packages/components/src/toolbar/toolbar-group/style.scss diff --git a/packages/components/src/toolbar-group/toolbar-group-collapsed.js b/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.js similarity index 89% rename from packages/components/src/toolbar-group/toolbar-group-collapsed.js rename to packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.js index c671a4dd00f99f..048f0776d714fc 100644 --- a/packages/components/src/toolbar-group/toolbar-group-collapsed.js +++ b/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.js @@ -6,9 +6,9 @@ import { useContext } from '@wordpress/element'; /** * Internal dependencies */ -import DropdownMenu from '../dropdown-menu'; +import DropdownMenu from '../../dropdown-menu'; import ToolbarContext from '../toolbar-context'; -import ToolbarItem from '../toolbar-item'; +import ToolbarItem from '../../toolbar-item'; function ToolbarGroupCollapsed( { controls = [], toggleProps, ...props } ) { // It'll contain state if `ToolbarGroup` is being used within diff --git a/packages/components/src/toolbar-group/toolbar-group-collapsed.native.js b/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.native.js similarity index 100% rename from packages/components/src/toolbar-group/toolbar-group-collapsed.native.js rename to packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.native.js diff --git a/packages/components/src/toolbar-group/toolbar-group-container.js b/packages/components/src/toolbar/toolbar-group/toolbar-group-container.js similarity index 100% rename from packages/components/src/toolbar-group/toolbar-group-container.js rename to packages/components/src/toolbar/toolbar-group/toolbar-group-container.js diff --git a/packages/components/src/toolbar-group/toolbar-group-container.native.js b/packages/components/src/toolbar/toolbar-group/toolbar-group-container.native.js similarity index 100% rename from packages/components/src/toolbar-group/toolbar-group-container.native.js rename to packages/components/src/toolbar/toolbar-group/toolbar-group-container.native.js diff --git a/packages/components/src/toolbar/toolbar/index.js b/packages/components/src/toolbar/toolbar/index.js index c5aeb27efbe870..f798e3c3776a9f 100644 --- a/packages/components/src/toolbar/toolbar/index.js +++ b/packages/components/src/toolbar/toolbar/index.js @@ -12,7 +12,7 @@ import deprecated from '@wordpress/deprecated'; /** * Internal dependencies */ -import ToolbarGroup from '../../toolbar-group'; +import ToolbarGroup from '../toolbar-group'; import ToolbarContainer from './toolbar-container'; /** From 286712f5a45380aa873c5e88dd720d0c915e9d39 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 18:05:19 +0100 Subject: [PATCH 06/14] Move `ToolbarItem` inside `toolbar-item` subfolder --- packages/components/src/toolbar/toolbar-dropdown-menu/index.js | 2 +- .../src/toolbar/toolbar-group/toolbar-group-collapsed.js | 2 +- packages/components/src/{ => toolbar}/toolbar-item/README.md | 0 packages/components/src/{ => toolbar}/toolbar-item/index.js | 0 .../components/src/{ => toolbar}/toolbar-item/index.native.js | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename packages/components/src/{ => toolbar}/toolbar-item/README.md (100%) rename packages/components/src/{ => toolbar}/toolbar-item/index.js (100%) rename packages/components/src/{ => toolbar}/toolbar-item/index.native.js (100%) diff --git a/packages/components/src/toolbar/toolbar-dropdown-menu/index.js b/packages/components/src/toolbar/toolbar-dropdown-menu/index.js index a7e78a616cce26..5fcfe51313631c 100644 --- a/packages/components/src/toolbar/toolbar-dropdown-menu/index.js +++ b/packages/components/src/toolbar/toolbar-dropdown-menu/index.js @@ -6,7 +6,7 @@ import { forwardRef, useContext } from '@wordpress/element'; /** * Internal dependencies */ -import ToolbarItem from '../../toolbar-item'; +import ToolbarItem from '../toolbar-item'; import ToolbarContext from '../toolbar-context'; import DropdownMenu from '../../dropdown-menu'; diff --git a/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.js b/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.js index 048f0776d714fc..371f4b9e5f6561 100644 --- a/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.js +++ b/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.js @@ -8,7 +8,7 @@ import { useContext } from '@wordpress/element'; */ import DropdownMenu from '../../dropdown-menu'; import ToolbarContext from '../toolbar-context'; -import ToolbarItem from '../../toolbar-item'; +import ToolbarItem from '../toolbar-item'; function ToolbarGroupCollapsed( { controls = [], toggleProps, ...props } ) { // It'll contain state if `ToolbarGroup` is being used within diff --git a/packages/components/src/toolbar-item/README.md b/packages/components/src/toolbar/toolbar-item/README.md similarity index 100% rename from packages/components/src/toolbar-item/README.md rename to packages/components/src/toolbar/toolbar-item/README.md diff --git a/packages/components/src/toolbar-item/index.js b/packages/components/src/toolbar/toolbar-item/index.js similarity index 100% rename from packages/components/src/toolbar-item/index.js rename to packages/components/src/toolbar/toolbar-item/index.js diff --git a/packages/components/src/toolbar-item/index.native.js b/packages/components/src/toolbar/toolbar-item/index.native.js similarity index 100% rename from packages/components/src/toolbar-item/index.native.js rename to packages/components/src/toolbar/toolbar-item/index.native.js From 8b4600ff55f824ba0bb7e3e0b188bf015c1739f9 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 18:05:36 +0100 Subject: [PATCH 07/14] Fix `Button` import path --- packages/components/src/toolbar/toolbar-button/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/toolbar/toolbar-button/index.js b/packages/components/src/toolbar/toolbar-button/index.js index d053ea2b52cf6e..51300c304fdc7c 100644 --- a/packages/components/src/toolbar/toolbar-button/index.js +++ b/packages/components/src/toolbar/toolbar-button/index.js @@ -9,7 +9,7 @@ import { useContext, forwardRef } from '@wordpress/element'; /** * Internal dependencies */ -import Button from '../button'; +import Button from '../../button'; import ToolbarItem from '../toolbar-item'; import ToolbarContext from '../toolbar-context'; import ToolbarButtonContainer from './toolbar-button-container'; From bacdf2a7663279cb1ad98e8505aad748d5a33990 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 18:05:50 +0100 Subject: [PATCH 08/14] Fix styles import path --- packages/components/src/style.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/components/src/style.scss b/packages/components/src/style.scss index 80dc3dbb682669..1cb363cb6d50c2 100644 --- a/packages/components/src/style.scss +++ b/packages/components/src/style.scss @@ -44,7 +44,7 @@ @import "./tab-panel/style.scss"; @import "./text-control/style.scss"; @import "./tip/style.scss"; -@import "./toolbar/style.scss"; -@import "./toolbar-button/style.scss"; -@import "./toolbar-group/style.scss"; +@import "./toolbar/toolbar/style.scss"; +@import "./toolbar/toolbar-button/style.scss"; +@import "./toolbar/toolbar-group/style.scss"; @import "./tooltip/style.scss"; From e7179380e628c3bba63d77048ce5449ddf97792a Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 18:06:13 +0100 Subject: [PATCH 09/14] Rewrite package exports --- packages/components/src/index.js | 14 ++++++++------ packages/components/src/index.native.js | 14 ++++++++------ packages/components/src/toolbar/index.js | 6 ++++++ 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 packages/components/src/toolbar/index.js diff --git a/packages/components/src/index.js b/packages/components/src/index.js index 96b2caf328f088..ee20e323a363e9 100644 --- a/packages/components/src/index.js +++ b/packages/components/src/index.js @@ -155,12 +155,14 @@ export { ToggleGroupControlOption as __experimentalToggleGroupControlOption, ToggleGroupControlOptionIcon as __experimentalToggleGroupControlOptionIcon, } from './toggle-group-control'; -export { default as Toolbar } from './toolbar'; -export { default as ToolbarButton } from './toolbar-button'; -export { default as ToolbarDropdownMenu } from './toolbar-dropdown-menu'; -export { default as __experimentalToolbarContext } from './toolbar-context'; -export { default as ToolbarGroup } from './toolbar-group'; -export { default as ToolbarItem } from './toolbar-item'; +export { + Toolbar, + ToolbarButton, + ToolbarContext as __experimentalToolbarContext, + ToolbarDropdownMenu, + ToolbarGroup, + ToolbarItem, +} from './toolbar'; export { ToolsPanel as __experimentalToolsPanel, ToolsPanelItem as __experimentalToolsPanelItem, diff --git a/packages/components/src/index.native.js b/packages/components/src/index.native.js index 140ad940ace6eb..36ddedb60cf4ac 100644 --- a/packages/components/src/index.native.js +++ b/packages/components/src/index.native.js @@ -15,12 +15,14 @@ export { default as Dashicon } from './dashicon'; export { default as Dropdown } from './dropdown'; export { default as DropdownMenu } from './dropdown-menu'; export { default as FocalPointPicker } from './focal-point-picker'; -export { default as Toolbar } from './toolbar'; -export { default as ToolbarButton } from './toolbar-button'; -export { default as __experimentalToolbarContext } from './toolbar-context'; -export { default as ToolbarGroup } from './toolbar-group'; -export { default as ToolbarItem } from './toolbar-item'; -export { default as ToolbarDropdownMenu } from './toolbar-dropdown-menu'; +export { + Toolbar, + ToolbarButton, + ToolbarContext as __experimentalToolbarContext, + ToolbarDropdownMenu, + ToolbarGroup, + ToolbarItem, +} from './toolbar'; export { default as Tooltip } from './tooltip'; export { default as Icon } from './icon'; export { default as Spinner } from './spinner'; diff --git a/packages/components/src/toolbar/index.js b/packages/components/src/toolbar/index.js new file mode 100644 index 00000000000000..a337fd3af4d216 --- /dev/null +++ b/packages/components/src/toolbar/index.js @@ -0,0 +1,6 @@ +export { default as Toolbar } from './toolbar'; +export { default as ToolbarButton } from './toolbar-button'; +export { default as ToolbarContext } from './toolbar-context'; +export { default as ToolbarDropdownMenu } from './toolbar-dropdown-menu'; +export { default as ToolbarGroup } from './toolbar-group'; +export { default as ToolbarItem } from './toolbar-item'; From 0ed5c681debc97d424713f06bc59f3d42d73cc0f Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 18:06:35 +0100 Subject: [PATCH 10/14] Remove unnecessary `tsconfig.json` exclude lines --- packages/components/tsconfig.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json index ad419a2af4ec75..a116639b9df341 100644 --- a/packages/components/tsconfig.json +++ b/packages/components/tsconfig.json @@ -63,11 +63,6 @@ "src/panel", "src/query-controls", "src/toolbar", - "src/toolbar-button", - "src/toolbar-context", - "src/toolbar-dropdown-menu", - "src/toolbar-group", - "src/toolbar-item", "src/tree-grid" ] } From 2fb1ef25aec28b5d2e6feff169b1cdb236ef3da3 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 18:13:29 +0100 Subject: [PATCH 11/14] Fix imports in stories and tests --- packages/components/src/toolbar/stories/index.js | 11 ++--------- .../components/src/toolbar/stories/toolbar-button.js | 3 +-- packages/components/src/toolbar/test/index.js | 3 +-- packages/components/src/toolbar/test/toolbar-group.js | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/packages/components/src/toolbar/stories/index.js b/packages/components/src/toolbar/stories/index.js index bfd89ab5933c2f..a186c1c0de50ed 100644 --- a/packages/components/src/toolbar/stories/index.js +++ b/packages/components/src/toolbar/stories/index.js @@ -17,15 +17,8 @@ import { /** * Internal dependencies */ -import Toolbar from '..'; -import { - SVG, - Path, - ToolbarButton, - ToolbarGroup, - ToolbarItem, - DropdownMenu, -} from '../../..'; +import { Toolbar, ToolbarButton, ToolbarGroup, ToolbarItem } from '..'; +import { SVG, Path, DropdownMenu } from '../../..'; export default { title: 'Components/Toolbar', component: Toolbar }; diff --git a/packages/components/src/toolbar/stories/toolbar-button.js b/packages/components/src/toolbar/stories/toolbar-button.js index 2a90172a793bd0..3740ed8b2bc10f 100644 --- a/packages/components/src/toolbar/stories/toolbar-button.js +++ b/packages/components/src/toolbar/stories/toolbar-button.js @@ -11,8 +11,7 @@ import { wordpress } from '@wordpress/icons'; /** * Internal dependencies */ -import { Toolbar } from '../../'; -import ToolbarButton from '../'; +import { Toolbar, ToolbarButton } from '..'; export default { title: 'Components/ToolbarButton', diff --git a/packages/components/src/toolbar/test/index.js b/packages/components/src/toolbar/test/index.js index 1b48415d28ca9e..c9e58edc8a80e8 100644 --- a/packages/components/src/toolbar/test/index.js +++ b/packages/components/src/toolbar/test/index.js @@ -6,8 +6,7 @@ import { render, screen } from '@testing-library/react'; /** * Internal dependencies */ -import Toolbar from '../'; -import ToolbarButton from '../../toolbar-button'; +import { Toolbar, ToolbarButton } from '..'; describe( 'Toolbar', () => { describe( 'basic rendering', () => { diff --git a/packages/components/src/toolbar/test/toolbar-group.js b/packages/components/src/toolbar/test/toolbar-group.js index 7a0317254a3eae..1b4c2613c4474c 100644 --- a/packages/components/src/toolbar/test/toolbar-group.js +++ b/packages/components/src/toolbar/test/toolbar-group.js @@ -6,7 +6,7 @@ import { fireEvent, render, screen } from '@testing-library/react'; /** * Internal dependencies */ -import ToolbarGroup from '..'; +import { ToolbarGroup } from '..'; describe( 'ToolbarGroup', () => { describe( 'basic rendering', () => { From ac4b773cbce7751db28dd249076c7c7f5bd117d2 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 18:24:06 +0100 Subject: [PATCH 12/14] CHANGELOG --- packages/components/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index da2cd8c80056a3..4bff05bdba2d79 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -4,6 +4,7 @@ ### Internal +- `Toolbar`: move all subcomponents under the same folder ([46951](https://github.com/WordPress/gutenberg/pull/46951)). - `Dashicon`: remove unnecessary type for `className` prop ([46849](https://github.com/WordPress/gutenberg/pull/46849)). - `ColorPicker` & `QueryControls`: Replace bottom margin overrides with `__nextHasNoMarginBottom` ([#46448](https://github.com/WordPress/gutenberg/pull/46448)). - `SandBox`: Convert to TypeScript ([#46478](https://github.com/WordPress/gutenberg/pull/46478)). From 1a112db97b024aeaa2a837800bbcc973b11ed5b4 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Fri, 6 Jan 2023 18:26:30 +0100 Subject: [PATCH 13/14] Fix native import --- .../src/toolbar/toolbar-group/toolbar-group-collapsed.native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.native.js b/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.native.js index 411a4e6edbd604..6fa7b6f6bc13be 100644 --- a/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.native.js +++ b/packages/components/src/toolbar/toolbar-group/toolbar-group-collapsed.native.js @@ -9,7 +9,7 @@ import { withPreferredColorScheme } from '@wordpress/compose'; /** * Internal dependencies */ -import DropdownMenu from '../dropdown-menu'; +import DropdownMenu from '../../dropdown-menu'; import styles from './style.scss'; function ToolbarGroupCollapsed( { From 453171006234ffc68234b2ffbb5ca312aa08061d Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Mon, 9 Jan 2023 14:01:43 +0100 Subject: [PATCH 14/14] Update Docs Manifest --- docs/manifest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/manifest.json b/docs/manifest.json index a06df18c6c44b9..fbffcbcfb2fb01 100644 --- a/docs/manifest.json +++ b/docs/manifest.json @@ -1268,31 +1268,31 @@ { "title": "ToolbarButton", "slug": "toolbar-button", - "markdown_source": "../packages/components/src/toolbar-button/README.md", + "markdown_source": "../packages/components/src/toolbar/toolbar-button/README.md", "parent": "components" }, { "title": "ToolbarDropdownMenu", "slug": "toolbar-dropdown-menu", - "markdown_source": "../packages/components/src/toolbar-dropdown-menu/README.md", + "markdown_source": "../packages/components/src/toolbar/toolbar-dropdown-menu/README.md", "parent": "components" }, { "title": "ToolbarGroup", "slug": "toolbar-group", - "markdown_source": "../packages/components/src/toolbar-group/README.md", + "markdown_source": "../packages/components/src/toolbar/toolbar-group/README.md", "parent": "components" }, { "title": "ToolbarItem", "slug": "toolbar-item", - "markdown_source": "../packages/components/src/toolbar-item/README.md", + "markdown_source": "../packages/components/src/toolbar/toolbar-item/README.md", "parent": "components" }, { "title": "Toolbar", "slug": "toolbar", - "markdown_source": "../packages/components/src/toolbar/README.md", + "markdown_source": "../packages/components/src/toolbar/toolbar/README.md", "parent": "components" }, {