diff --git a/.github/workflows/tests-e2e.yml b/.github/workflows/tests-e2e.yml index 402b3c3ca..ca4c796aa 100644 --- a/.github/workflows/tests-e2e.yml +++ b/.github/workflows/tests-e2e.yml @@ -17,14 +17,9 @@ concurrency: jobs: playwright: - name: Playwright - ${{ matrix.part }} + name: Playwright runs-on: ubuntu-latest if: ${{ github.repository == 'nk-crew/lazy-blocks' || github.event_name == 'pull_request' }} - strategy: - fail-fast: false - matrix: - part: [1, 2, 3, 4] - totalParts: [4] steps: - uses: actions/checkout@v4 @@ -45,4 +40,4 @@ jobs: - name: Run the tests run: | - xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:e2e -- --shard=${{ matrix.part }}/${{ matrix.totalParts }} + xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:e2e diff --git a/assets/admin/templates/index.js b/assets/admin/templates/index.js index 8d2f084b5..b08b15d1f 100644 --- a/assets/admin/templates/index.js +++ b/assets/admin/templates/index.js @@ -14,7 +14,7 @@ import { useSelect } from '@wordpress/data'; import { useEntityProp } from '@wordpress/core-data'; import { PanelRow, SelectControl } from '@wordpress/components'; import { useDebounce } from '@wordpress/compose'; -import { PluginDocumentSettingPanel } from '@wordpress/edit-post'; +import { PluginDocumentSettingPanel } from '@wordpress/editor'; /** * Internal dependencies @@ -182,6 +182,8 @@ function UpdateEditor() { onChange={(value) => { updateMeta('_lzb_template_post_types', value); }} + __next40pxDefaultSize + __nextHasNoMarginBottom /> @@ -194,6 +196,8 @@ function UpdateEditor() { onChange={(value) => { updateMeta('_lzb_template_lock', value); }} + __next40pxDefaultSize + __nextHasNoMarginBottom /> diff --git a/assets/admin/tools/index.scss b/assets/admin/tools/index.scss index 83cd00211..12cbb0f66 100644 --- a/assets/admin/tools/index.scss +++ b/assets/admin/tools/index.scss @@ -19,6 +19,19 @@ background-color: #f1f1f1; border: 1px solid #ccd0d4; border-radius: 4px; + + .components-toggle-control__label { + padding-top: 3px; + margin-left: 0 !important; + + > span { + margin-top: -3px; + } + } + + .components-toggle-control > .components-base-control__field > .components-flex { + align-items: start; + } } .lzb-export-textarea { diff --git a/assets/admin/tools/tools.js b/assets/admin/tools/tools.js index 374d2bc02..e11c518d9 100644 --- a/assets/admin/tools/tools.js +++ b/assets/admin/tools/tools.js @@ -112,7 +112,7 @@ export default function Templates() { return ( <>
- + {data[type].map((item) => { const isSelected = @@ -215,6 +216,7 @@ export default function Templates() { setDisabledTemplates(newDisabled); } }} + __nextHasNoMarginBottom /> ); })} @@ -228,6 +230,8 @@ export default function Templates() { className="lzb-export-code" readOnly value={getPHPStringCode(type)} + __next40pxDefaultSize + __nextHasNoMarginBottom />
diff --git a/assets/components/block-slug/editor.scss b/assets/components/block-slug/editor.scss index 275f10b74..8b74d0deb 100644 --- a/assets/components/block-slug/editor.scss +++ b/assets/components/block-slug/editor.scss @@ -13,7 +13,7 @@ white-space: nowrap; padding: 6px 8px; padding-right: 10px; - height: 32px; + height: 40px; border: 1px solid #949494; line-height: normal; color: $gray-800; @@ -39,7 +39,9 @@ flex: 1; margin-bottom: 0 !important; - input { + input.components-text-control__input { + padding-left: 5px; + padding-right: 5px; margin-left: 0; border-left: none; border-top-left-radius: 0; diff --git a/assets/components/block-slug/index.js b/assets/components/block-slug/index.js index 38baec65f..0dc58f099 100644 --- a/assets/components/block-slug/index.js +++ b/assets/components/block-slug/index.js @@ -17,7 +17,11 @@ import { __ } from '@wordpress/i18n'; export default function BlockSlug(props) { return ( - +
diff --git a/assets/components/document-tabs/editor.scss b/assets/components/document-tabs/editor.scss index ad88d97a2..6752778d4 100644 --- a/assets/components/document-tabs/editor.scss +++ b/assets/components/document-tabs/editor.scss @@ -10,6 +10,7 @@ display: flex; margin-bottom: -1px; background-color: #fff; + padding: 0; z-index: 2; > ul { @@ -21,6 +22,7 @@ button { position: relative; + padding: 12px 16px; height: 48px; font-weight: 500; outline: none; diff --git a/assets/components/icon-picker/index.js b/assets/components/icon-picker/index.js index 2f9b25336..f5e84fa3d 100644 --- a/assets/components/icon-picker/index.js +++ b/assets/components/icon-picker/index.js @@ -88,6 +88,8 @@ function IconPickerDropdown(props) { onChange={(searchVal) => setSearch(searchVal)} placeholder={__('Type to Search…', 'lazy-blocks')} autoComplete="off" + __next40pxDefaultSize + __nextHasNoMarginBottom /> ), @@ -297,7 +299,12 @@ function IconPickerDropdown(props) { ); return label ? ( - + {dropdown} ) : ( diff --git a/assets/components/preview-server-callback/index.js b/assets/components/preview-server-callback/index.js index 26a1f5c15..9dc9b22eb 100644 --- a/assets/components/preview-server-callback/index.js +++ b/assets/components/preview-server-callback/index.js @@ -152,12 +152,13 @@ export default function PreviewServerCallback(props) { // When the component unmounts, set isMountedRef to false. This will // let the async fetch callbacks know when to stop. - useEffect( - () => () => { + useEffect(() => { + isMountedRef.current = true; + + return () => { isMountedRef.current = false; - }, - [] - ); + }; + }, []); // eslint-disable-next-line react-hooks/exhaustive-deps useEffect(() => { diff --git a/assets/components/pro-notice/index.js b/assets/components/pro-notice/index.js index 5ac98d3ba..00de74735 100644 --- a/assets/components/pro-notice/index.js +++ b/assets/components/pro-notice/index.js @@ -22,6 +22,7 @@ export default function ProNotice() { id="lazyblocks-pro-notice" label={__('Lazy Blocks Pro', 'lazy-blocks')} className="lazyblocks-component-pro-notice" + __nextHasNoMarginBottom >
  • - {__('Custom Slugs and Collections', 'lazy-blocks')} + {__( + 'Custom block collections and slug namespaces', + 'lazy-blocks' + )}
  • {__('Controls Conditional Logic', 'lazy-blocks')} diff --git a/assets/components/tabs/index.js b/assets/components/tabs/index.js index 8854d70b1..c406154ac 100644 --- a/assets/components/tabs/index.js +++ b/assets/components/tabs/index.js @@ -10,7 +10,7 @@ import { BaseControl, TabPanel } from '@wordpress/components'; export default function Tabs({ tabs, children }) { return ( - + {children} diff --git a/assets/editor-constructor/boxes/code-preview/index.js b/assets/editor-constructor/boxes/code-preview/index.js index 14eda823d..dc740a26b 100644 --- a/assets/editor-constructor/boxes/code-preview/index.js +++ b/assets/editor-constructor/boxes/code-preview/index.js @@ -138,6 +138,8 @@ export default function CodePreview(props) { const $frameObserver = iframeObserver.current; const $frame = iframeRef.current; + isMountedRef.current = true; + return () => { $frameObserver.disconnect(); $frame.removeEventListener('load', setIframeHeight); diff --git a/assets/editor-constructor/boxes/code/index.js b/assets/editor-constructor/boxes/code/index.js index bafb0acbe..352480ce6 100644 --- a/assets/editor-constructor/boxes/code/index.js +++ b/assets/editor-constructor/boxes/code/index.js @@ -101,6 +101,8 @@ export default function CustomCodeSettings(props) { value={data.code_output_method || 'html'} onChange={(value) => updateData({ code_output_method: value })} isAdaptiveWidth + __next40pxDefaultSize + __nextHasNoMarginBottom > - + {tabs.length > 1 ? ( - + {!showInfo ? (