From 94d58c747d20985e5fa07cab1c29b851318ccf72 Mon Sep 17 00:00:00 2001 From: Xavier Julian Date: Thu, 14 May 2026 10:25:58 +0200 Subject: [PATCH] :bug: Fix schema and tooltip --- frontend/src/app/main/ui/ds/buttons/icon_button.cljs | 2 +- frontend/src/app/main/ui/ds/buttons/icon_button.scss | 3 ++- .../src/app/main/ui/ds/buttons/icon_button.stories.jsx | 9 +++++++++ .../src/app/main/ui/ds/tool_toolbar/tool_toolbar.cljs | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/ui/ds/buttons/icon_button.cljs b/frontend/src/app/main/ui/ds/buttons/icon_button.cljs index 7b4a339741..3879202304 100644 --- a/frontend/src/app/main/ui/ds/buttons/icon_button.cljs +++ b/frontend/src/app/main/ui/ds/buttons/icon_button.cljs @@ -26,7 +26,7 @@ [:tooltip-placement {:optional true} [:maybe [:enum "top" "bottom" "left" "right" "top-right" "bottom-right" "bottom-left" "top-left"]]] ;; Indicates that the button has a flyout menu, and should display an indicator - [:flyout-indicator {:optional true} :boolean] + [:flyout-indicator {:optional true} [:maybe :boolean]] [:variant {:optional true} [:maybe [:enum "primary" "secondary" "ghost" "destructive" "action"]]]]) diff --git a/frontend/src/app/main/ui/ds/buttons/icon_button.scss b/frontend/src/app/main/ui/ds/buttons/icon_button.scss index 5cc82e105e..c7810ca00e 100644 --- a/frontend/src/app/main/ui/ds/buttons/icon_button.scss +++ b/frontend/src/app/main/ui/ds/buttons/icon_button.scss @@ -16,6 +16,7 @@ display: grid; place-content: center; + position: relative; } .icon-button-primary { @@ -54,7 +55,7 @@ position: absolute; inset-block-end: 4px; inset-inline-end: 4px; - stroke: var(--stroke-color); + stroke: currentcolor; fill: none; inline-size: $sz-6; block-size: $sz-6; diff --git a/frontend/src/app/main/ui/ds/buttons/icon_button.stories.jsx b/frontend/src/app/main/ui/ds/buttons/icon_button.stories.jsx index fd90936d34..de37e42a02 100644 --- a/frontend/src/app/main/ui/ds/buttons/icon_button.stories.jsx +++ b/frontend/src/app/main/ui/ds/buttons/icon_button.stories.jsx @@ -24,6 +24,7 @@ export default { options: iconList, control: { type: "select" }, }, + flyoutIndicator: { control: "boolean" }, disabled: { control: "boolean" }, variant: { options: ["primary", "secondary", "ghost", "destructive", "action"], @@ -35,6 +36,7 @@ export default { variant: undefined, "aria-label": "Lorem ipsum", icon: "effects", + flyoutIndicator: false, }, render: ({ ...args }) => , }; @@ -70,3 +72,10 @@ export const Destructive = { variant: "destructive", }, }; + +export const Flyout = { + args: { + variant: "ghost", + flyoutIndicator: true, + }, +}; diff --git a/frontend/src/app/main/ui/ds/tool_toolbar/tool_toolbar.cljs b/frontend/src/app/main/ui/ds/tool_toolbar/tool_toolbar.cljs index 4d3e965514..77d018f4a8 100644 --- a/frontend/src/app/main/ui/ds/tool_toolbar/tool_toolbar.cljs +++ b/frontend/src/app/main/ui/ds/tool_toolbar/tool_toolbar.cljs @@ -73,12 +73,12 @@ {::mf/wrap [mf/memo]} [{:keys [selected has-flyout title icon on-click aria-haspopup aria-expanded role data-tool]}] [:> icon-button* {:variant "ghost" - :title title :aria-haspopup aria-haspopup :aria-expanded aria-expanded :aria-pressed selected :role role :aria-label title + :tooltip-placement "top" :class (stl/css :main-toolbar-options-button) :on-click on-click :icon icon