From 1069318bd9ab1739e21d647a2aabe549e2380ede Mon Sep 17 00:00:00 2001 From: AOKI Takashi <55625375+RyushiAok@users.noreply.github.com> Date: Mon, 28 Oct 2024 03:15:53 +0900 Subject: [PATCH 1/2] feat: tooltip z-index --- packages/constants/styles/z-index.ts | 8 ++++++-- .../wiz-ui-next/src/components/base/tooltip/tooltip.vue | 9 +++++---- .../src/components/base/tooltip/components/tooltip.tsx | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/constants/styles/z-index.ts b/packages/constants/styles/z-index.ts index f882a03a3..5ccfdd27e 100644 --- a/packages/constants/styles/z-index.ts +++ b/packages/constants/styles/z-index.ts @@ -13,13 +13,17 @@ export const Z_INDEX_MAP = { */ dialog: "2000", /** - * dropdown(選択系),tooltip(情報系),alert + * dropdown(選択系), alert */ popover: "3000", + /** + * tooltip(情報系) + */ + tooltip: "4000", /** * overlay(全画面系) */ - overlay: "4000", + overlay: "5000", } as const; export type ZIndexKeys = keyof typeof Z_INDEX_MAP; diff --git a/packages/wiz-ui-next/src/components/base/tooltip/tooltip.vue b/packages/wiz-ui-next/src/components/base/tooltip/tooltip.vue index 94813555d..e41aceec8 100644 --- a/packages/wiz-ui-next/src/components/base/tooltip/tooltip.vue +++ b/packages/wiz-ui-next/src/components/base/tooltip/tooltip.vue @@ -15,6 +15,7 @@ :animation="true" @onTurn="turnPopup" gap="xs2" + layer="tooltip" :isDirectionFixed="isDirectionFixed" >
import { ComponentName } from "@wizleap-inc/wiz-ui-constants"; import { - tooltipStyle, tooltipContentStyle, - tooltipIconStyle, tooltipIconDirectionStyle, - tooltipPositionStyle, + tooltipIconStyle, tooltipPopupStyle, + tooltipPositionStyle, + tooltipStyle, } from "@wizleap-inc/wiz-ui-styles/bases/tooltip.css"; -import { PropType, ref, computed } from "vue"; +import { computed, PropType, ref } from "vue"; import { WizIChangeHistory, WizPopup, WizPopupContainer } from "@/components"; diff --git a/packages/wiz-ui-react/src/components/base/tooltip/components/tooltip.tsx b/packages/wiz-ui-react/src/components/base/tooltip/components/tooltip.tsx index b159cdc4b..a7f9d855b 100644 --- a/packages/wiz-ui-react/src/components/base/tooltip/components/tooltip.tsx +++ b/packages/wiz-ui-react/src/components/base/tooltip/components/tooltip.tsx @@ -56,6 +56,7 @@ const Tooltip: FC = ({ shadow={false} animation gap="xs2" + layer="tooltip" isDirectionFixed={isDirectionFixed} >
Date: Mon, 28 Oct 2024 03:16:00 +0900 Subject: [PATCH 2/2] chore: add changeset --- .changeset/plenty-birds-hear.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/plenty-birds-hear.md diff --git a/.changeset/plenty-birds-hear.md b/.changeset/plenty-birds-hear.md new file mode 100644 index 000000000..12dca74eb --- /dev/null +++ b/.changeset/plenty-birds-hear.md @@ -0,0 +1,7 @@ +--- +"@wizleap-inc/wiz-ui-constants": minor +"@wizleap-inc/wiz-ui-next": patch +"@wizleap-inc/wiz-ui-react": patch +--- + +Fix: tooltip を dropdown より上に表示する