Skip to content

Commit b3f4429

Browse files
authored
chore(fondue): bump fondue to rc.12 (#1383)
* chore(fondue): bump fondue to rc.12 * add changeset
1 parent 1cb6092 commit b3f4429

File tree

6 files changed

+55
-245
lines changed

6 files changed

+55
-245
lines changed

.changeset/yummy-rings-fix.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@frontify/guideline-blocks-settings": patch
3+
---
4+
5+
chore: bump fondue to latest rc

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@changesets/changelog-github": "^0.5.2",
3131
"@changesets/cli": "^2.29.8",
3232
"@cypress/vite-dev-server": "^7.0.1",
33-
"@frontify/fondue": "^13.0.0-rc.11",
33+
"@frontify/fondue": "^13.0.0-rc.12",
3434
"@types/react": "^18.3.27",
3535
"@vitejs/plugin-react": "^5.1.1",
3636
"cypress": "^15.7.1",

packages/guideline-blocks-settings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@dnd-kit/core": "^6.3.1",
5151
"@dnd-kit/modifiers": "^9.0.0",
5252
"@dnd-kit/sortable": "^10.0.0",
53-
"@frontify/fondue": "^13.0.0-rc.11",
53+
"@frontify/fondue": "^13.0.0-rc.12",
5454
"@frontify/sidebar-settings": "workspace:^",
5555
"@react-aria/focus": "^3.21.2",
5656
"@react-stately/overlays": "^3.6.20",

packages/guideline-blocks-settings/src/components/Attachments/AttachmentItem.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import { useSortable } from '@dnd-kit/sortable';
44
import { type Asset, useAssetUpload, useFileInput } from '@frontify/app-bridge';
5-
import { FOCUS_STYLE } from '@frontify/fondue';
65
import { LoadingCircle, Dropdown, Button } from '@frontify/fondue/components';
76
import {
87
IconArrowCircleUp,
@@ -75,6 +74,7 @@ export const AttachmentItem = forwardRef<HTMLButtonElement, AttachmentItemProps>
7574

7675
return (
7776
<button
77+
type="button"
7878
aria-label="Download attachment"
7979
data-test-id="attachments-item"
8080
onClick={() => !selectedAsset && onDownload?.()}
@@ -107,6 +107,7 @@ export const AttachmentItem = forwardRef<HTMLButtonElement, AttachmentItemProps>
107107
])}
108108
>
109109
<button
110+
type="button"
110111
{...focusProps}
111112
{...draggableProps}
112113
aria-label="Drag attachment"
@@ -115,7 +116,8 @@ export const AttachmentItem = forwardRef<HTMLButtonElement, AttachmentItemProps>
115116
isDragging || isOverlay
116117
? 'tw-cursor-grabbing tw-bg-button-background-pressed hover:tw-bg-button-background-pressed'
117118
: 'tw-cursor-grab hover:tw-bg-button-background-hover',
118-
isFocusVisible && FOCUS_STYLE,
119+
isFocusVisible &&
120+
'tw-ring-4 tw-ring-blue tw-ring-offset-2 dark:tw-ring-offset-black tw-outline-none',
119121
isFocusVisible && 'tw-z-[2]',
120122
])}
121123
>

packages/guideline-blocks-settings/src/components/DownloadButton/DownloadButton.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* (c) Copyright Frontify Ltd., all rights reserved. */
22

3-
import { FOCUS_STYLE } from '@frontify/fondue';
43
import { Tooltip } from '@frontify/fondue/components';
54
import { IconArrowCircleDown } from '@frontify/fondue/icons';
65
import { useFocusRing } from '@react-aria/focus';
@@ -16,10 +15,15 @@ export const DownloadButton = ({ onDownload, ariaLabel }: DownloadButtonProps) =
1615
<Tooltip.Root enterDelay={500}>
1716
<Tooltip.Trigger asChild>
1817
<button
18+
type="button"
1919
tabIndex={0}
2020
aria-label={ariaLabel ?? 'Download'}
2121
{...focusProps}
22-
className={joinClassNames(['tw-outline-none tw-rounded', isFocused && FOCUS_STYLE])}
22+
className={joinClassNames([
23+
'tw-outline-none tw-rounded',
24+
isFocused &&
25+
'tw-ring-4 tw-ring-blue tw-ring-offset-2 dark:tw-ring-offset-black tw-outline-none',
26+
])}
2327
onClick={onDownload}
2428
onPointerDown={(e) => e.preventDefault()}
2529
data-test-id="download-button"

0 commit comments

Comments
 (0)