Skip to content
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

Components: replace TabPanel with Tabs in inline color picker #57292

Merged
merged 4 commits into from
Jan 8, 2024
Merged

Components: replace TabPanel with Tabs in inline color picker #57292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
109106a
add support for private apis
chad1008 Dec 20, 2023
d0518e7
implement Tabs
chad1008 Dec 20, 2023
203cc06
update styles
chad1008 Dec 20, 2023
415e971
clean up styles
chad1008 Jan 8, 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
2 changes: 2 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/format-library/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@wordpress/html-entities": "file:../html-entities",
"@wordpress/i18n": "file:../i18n",
"@wordpress/icons": "file:../icons",
"@wordpress/private-apis": "file:../private-apis",
"@wordpress/rich-text": "file:../rich-text",
"@wordpress/url": "file:../url"
},
Expand Down
10 changes: 10 additions & 0 deletions packages/format-library/src/lock-unlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* WordPress dependencies
*/
import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';

export const { lock, unlock } =
__dangerousOptInToUnstableAPIsOnlyForCoreModules(
'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
'@wordpress/format-library'
);
59 changes: 36 additions & 23 deletions packages/format-library/src/text-color/inline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,24 @@ import {
store as blockEditorStore,
useCachedTruthy,
} from '@wordpress/block-editor';
import { Popover, TabPanel } from '@wordpress/components';
import {
Popover,
privateApis as componentsPrivateApis,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
*/
import { textColor as settings, transparentValue } from './index';
import { unlock } from '../lock-unlock';

const { Tabs } = unlock( componentsPrivateApis );

const TABS = [
{ name: 'color', title: __( 'Text' ) },
{ name: 'backgroundColor', title: __( 'Background' ) },
];

function parseCSS( css = '' ) {
return css.split( ';' ).reduce( ( accumulator, rule ) => {
Expand Down Expand Up @@ -155,30 +166,32 @@ export default function InlineColorUI( {
return (
<Popover
onClose={ onClose }
className="components-inline-color-popover"
className="format-library__inline-color-popover"
anchor={ popoverAnchor }
>
<TabPanel
tabs={ [
{
name: 'color',
title: __( 'Text' ),
},
{
name: 'backgroundColor',
title: __( 'Background' ),
},
] }
>
{ ( tab ) => (
<ColorPicker
name={ name }
property={ tab.name }
value={ value }
onChange={ onChange }
/>
) }
</TabPanel>
<Tabs>
<Tabs.TabList>
{ TABS.map( ( tab ) => (
<Tabs.Tab tabId={ tab.name } key={ tab.name }>
{ tab.title }
</Tabs.Tab>
) ) }
</Tabs.TabList>
{ TABS.map( ( tab ) => (
<Tabs.TabPanel
tabId={ tab.name }
focusable={ false }
key={ tab.name }
>
<ColorPicker
name={ name }
property={ tab.name }
value={ value }
onChange={ onChange }
/>
</Tabs.TabPanel>
) ) }
</Tabs>
</Popover>
);
}
23 changes: 3 additions & 20 deletions packages/format-library/src/text-color/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
.components-inline-color-popover {
.format-library__inline-color-popover {

.components-popover__content {
.components-tab-panel__tab-content {
padding: 16px;
}

.components-color-palette {
margin-top: 0.6rem;
}

.components-base-control__title {
display: block;
margin-bottom: 16px;
font-weight: 600;
color: #191e23;
}

.component-color-indicator {
vertical-align: text-bottom;
}
[role="tabpanel"] {
padding: 16px;
}
}
1 change: 1 addition & 0 deletions packages/private-apis/src/implementation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const CORE_MODULES_USING_PRIVATE_APIS = [
'@wordpress/edit-site',
'@wordpress/edit-widgets',
'@wordpress/editor',
'@wordpress/format-library',
'@wordpress/patterns',
'@wordpress/reusable-blocks',
'@wordpress/router',
Expand Down
Loading