Merge main to dev (#1359)

* fix(Toolbar): add missing padding option for the flyout (#1338)

* fix(Toolbar): add missing padding option for the flyout

Signed-off-by: Peter Tudosa <razvan-petru.tudosa@frontify.com>

* chore: add changeset

Signed-off-by: Peter Tudosa <razvan-petru.tudosa@frontify.com>

* Update .changeset/dirty-pans-eat.md

---------

Signed-off-by: Peter Tudosa <razvan-petru.tudosa@frontify.com>
Co-authored-by: Rafael Giezendanner <rafael.giezendanner@frontify.com>

* chore: release packages (#1339)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore: bump fondue to latest 12 (#1340)

* chore: bump fondue to latest 12

* fix test

---------

Co-authored-by: fulopdaniel <daniel.fulop@frontify.com>

* chore: release packages (#1341)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix(FlyoutToolbarButton): add missing body (#1342)

* chore: release packages (#1343)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* refactor(LinkSelector): improve blur handling (#1344)

* refactor(LinkSelector): improve blur handling

* add changeset

* chore: release packages (#1345)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore: Cleanup template properties [CU-869b5g3w9] (#1346)

* Removed `sector`, `unit` and `token`

* Added changeset

* chore: release packages (#1347)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Signed-off-by: Peter Tudosa <razvan-petru.tudosa@frontify.com>
Co-authored-by: Peter Razvan Tudosa <4538108+peter-tudosa@users.noreply.github.com>
Co-authored-by: Rafael Giezendanner <rafael.giezendanner@frontify.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Fabian Keller <chaelli91@gmail.com>

Author: 5 people

packages/app-bridge/CHANGELOG.md

@@ -77,6 +77,12 @@
 
 - chore: merge main to dev
 
+## 3.12.0
+
+### Minor Changes
+
+- [#1346](https://github.com/Frontify/brand-sdk/pull/1346) [`47eaab2`](https://github.com/Frontify/brand-sdk/commit/47eaab210961db1eeb01cb3da2ff7d623a5b07a2) Thanks [@findmind](https://github.com/findmind)! - refactor(TemplateApiLegacy): removed unused `token`, `unit` and `sector`
+
 ## 3.11.2
 
 ### Patch Changes

packages/app-bridge/src/tests/TemplateApiLegacyDummy.ts

@@ -18,9 +18,6 @@ export class TemplateApiLegacyDummy {
             project_type: 'A project type',
             published: 1,
             screen_id: 1,
-            sector: 'A sector',
-            token: '--token--',
-            unit: 'px',
             width: 640,
         };
     }

packages/app-bridge/src/types/TemplateLegacy.ts

@@ -14,9 +14,6 @@ export type TemplateApiLegacy = {
     project_type: string;
     published: number;
     screen_id: number;
-    sector: string;
-    token: string;
-    unit: string;
     width: number;
 };
 

packages/guideline-blocks-settings/CHANGELOG.md

@@ -32,6 +32,30 @@
 
 - [#1286](https://github.com/Frontify/brand-sdk/pull/1286) [`8ed6d57`](https://github.com/Frontify/brand-sdk/commit/8ed6d57ad71cf81d73798e4f639103960be8dc93) Thanks [@fulopdaniel](https://github.com/fulopdaniel)! - chore: bump fondue to v13
 
+## 1.0.12
+
+### Patch Changes
+
+- [#1344](https://github.com/Frontify/brand-sdk/pull/1344) [`24bf5f2`](https://github.com/Frontify/brand-sdk/commit/24bf5f273f17cd8f0c03f1fd9f6194f10379f751) Thanks [@fulopdaniel](https://github.com/fulopdaniel)! - refactor(LinkSelector): improve blur handling
+
+## 1.0.11
+
+### Patch Changes
+
+- [#1342](https://github.com/Frontify/brand-sdk/pull/1342) [`4268d60`](https://github.com/Frontify/brand-sdk/commit/4268d6019b039a08af099107cb0f547b26223598) Thanks [@ragi96](https://github.com/ragi96)! - fix(FlyoutToolbarButton): add missing body
+
+## 1.0.10
+
+### Patch Changes
+
+- [#1340](https://github.com/Frontify/brand-sdk/pull/1340) [`167faba`](https://github.com/Frontify/brand-sdk/commit/167fabaab9e340cb3027531e906373b4c4de3039) Thanks [@ragi96](https://github.com/ragi96)! - chore: bump `@frontify/fondue` to latest `12.4.3`
+
+## 1.0.9
+
+### Patch Changes
+
+- [#1338](https://github.com/Frontify/brand-sdk/pull/1338) [`a1e43c2`](https://github.com/Frontify/brand-sdk/commit/a1e43c2a4d6ed998dc202a4d9518f7bc7f8a4a8b) Thanks [@peter-tudosa](https://github.com/peter-tudosa)! - fix(FlyoutToolbarButton): add missing padding option
+
 ## 1.0.8
 
 ### Patch Changes

packages/guideline-blocks-settings/README.md

@@ -7,7 +7,7 @@ Provides the block settings types for the guideline-blocks.
 ```ts
 /* (c) Copyright Frontify Ltd., all rights reserved. */
 
-import { IconEnum, defineSettings } from '@frontify/guideline-blocks-settings';
+import { defineSettings } from '@frontify/guideline-blocks-settings';
 
 export const settings = defineSettings({
     main: [
@@ -19,12 +19,12 @@ export const settings = defineSettings({
             choices: [
                 {
                     value: 'noline',
-                    icon: IconEnum.LineSpacer,
+                    icon: 'LineSpacer',
                     label: 'Spacer (no line)',
                 },
                 {
                     value: 'solid',
-                    icon: IconEnum.LineSolid,
+                    icon: 'LineSolid',
                     label: 'Line',
                 },
             ],
@@ -43,9 +43,9 @@ export const settings = defineSettings({
 
 ## Code Structure
 
--   `components` (React components which are reused across multiple blocks)
--   `utilities` (functionality without business logic)
--   `helpers` (functionality with business logic)
+- `components` (React components which are reused across multiple blocks)
+- `utilities` (functionality without business logic)
+- `helpers` (functionality with business logic)
 
 ## Using components
 

packages/guideline-blocks-settings/src/components/BlockItemWrapper/Toolbar/FlyoutToolbarButton/FlyoutToolbarButton.tsx

@@ -44,9 +44,9 @@ export const FlyoutToolbarButton = ({
                             {icon}
                         </BaseToolbarButton>
                     </Flyout.Trigger>
-                    <Flyout.Content side="bottom" align="end">
+                    <Flyout.Content side="bottom" align="end" padding="comfortable">
                         {flyoutHeader ? <Flyout.Header>{flyoutHeader}</Flyout.Header> : null}
-                        {content}
+                        <Flyout.Body>{content}</Flyout.Body>
                         {flyoutFooter ? <Flyout.Footer>{flyoutFooter}</Flyout.Footer> : null}
                     </Flyout.Content>
                 </Flyout.Root>

packages/guideline-blocks-settings/src/components/Link/LinkInput.spec.ct.tsx

@@ -5,7 +5,7 @@ import { withAppBridgeBlockStubs } from '@frontify/app-bridge';
 import { LinkInput } from './LinkInput';
 
 const LINK_INPUT_ID = '[data-test-id="link-input"]';
-const TEXT_INPUT_ID = '[data-test-id="text-input"]  input';
+const TEXT_INPUT_ID = '[data-test-id="text-input"] input';
 const INPUT_LABEL_CONTAINER_ID = '[data-test-id="input-label-container"]';
 const BUTTON_ID = '[data-test-id="fondue-dialog-trigger"]';
 const CHECKBOX_ID = '[data-test-id="fondue-checkbox"]';

packages/guideline-blocks-settings/src/components/Link/LinkInput.tsx

@@ -76,7 +76,7 @@ export const LinkInput = ({
 
             <div className="tw-mt-3 tw-flex tw-items-center tw-gap-1.5">
                 <Checkbox id="new-tab" value={newTab} onChange={() => onToggleTab?.(!newTab)} />
-                <Label id="new-tab-label" htmlFor="new-tab">
+                <Label id="new-tab-label" htmlFor="new-tab" className="tw-whitespace-nowrap">
                     Open in new tab
                 </Label>
             </div>

packages/guideline-blocks-settings/src/components/Link/LinkSelector/LinkSelector.tsx

@@ -59,7 +59,14 @@ export const LinkSelector = ({
     return (
         // eslint-disable-next-line jsx-a11y-x/no-static-element-interactions
         <div
-            onPointerDown={(event) => event.preventDefault()}
+            onPointerDownCapture={(event) => {
+                event.stopPropagation();
+                event.preventDefault();
+            }}
+            onFocusCapture={(event) => {
+                event.stopPropagation();
+                event.preventDefault();
+            }}
             data-test-id="internal-link-selector"
             onKeyDown={onPressEnter}
         >

packages/guideline-blocks-settings/src/components/RichTextEditor/plugins/ButtonPlugin/components/FloatingButton/useFloatingButtonEdit.ts

@@ -106,10 +106,7 @@ export const useFloatingButtonEdit = (
     useFloatingButtonEscape();
 
     return {
-        style: {
-            ...style,
-            zIndex: 1000,
-        },
+        style,
         ref: useComposedRef<HTMLElement | null>(floating),
     };
 };