diff --git a/packages/constants/component/name.ts b/packages/constants/component/name.ts index 62a1c5e906..a59240eec2 100644 --- a/packages/constants/component/name.ts +++ b/packages/constants/component/name.ts @@ -32,6 +32,7 @@ export const ComponentName = { MenuItem: "WizMenuItem", Drawer: "WizDrawer", NavigationContainer: "WizNavigationContainer", + NavigationContent: "WizNavigationContent", NavigationItem: "WizNavigationItem", PopupContainer: "WizPopupContainer", Popup: "WizPopup", diff --git a/packages/styles/bases/navigation.css.ts b/packages/styles/bases/navigation.css.ts index 44a44df42f..c9287d1233 100644 --- a/packages/styles/bases/navigation.css.ts +++ b/packages/styles/bases/navigation.css.ts @@ -112,3 +112,8 @@ export const navigationPopupContainerStyle = style({ maxHeight: "25rem", overflowY: "auto", }); + +export const navigationContentStyle = style({ + marginTop: `calc(${THEME.share.HEADER_HEIGHT} + 1px)`, + transition: "margin 0.2s ease-in-out", +}); diff --git a/packages/wiz-ui-next/src/components/base/navigation/container.stories.ts b/packages/wiz-ui-next/src/components/base/navigation/container.stories.ts index d7a8a8b763..46399acb43 100644 --- a/packages/wiz-ui-next/src/components/base/navigation/container.stories.ts +++ b/packages/wiz-ui-next/src/components/base/navigation/container.stories.ts @@ -11,7 +11,7 @@ import { import { ButtonGroupItem } from "../popup-button-group/types"; -import { WizNavContainer, WizNavItem } from "."; +import { WizNavContainer, WizNavItem, WizNavContent } from "."; export default { title: "Base/Navigation/Container", @@ -121,7 +121,7 @@ export const Close: StoryFn = (_, { argTypes }) => ({ export const Playground: StoryFn = (_, { argTypes }) => ({ props: Object.keys(argTypes), - components: { WizNavContainer, WizNavItem }, + components: { WizNavContainer, WizNavItem, WizNavContent }, setup() { const isOpen = ref(true); const toggle = () => (isOpen.value = !isOpen.value); @@ -136,7 +136,7 @@ export const Playground: StoryFn = (_, { argTypes }) => ({ }, template: `
- + @@ -147,17 +147,17 @@ export const Playground: StoryFn = (_, { argTypes }) => ({
Footer
-
+ デバッグ用 -
+
`, }); export const Fixed: StoryFn = (_, { argTypes }) => ({ props: Object.keys(argTypes), - components: { WizNavContainer, WizNavItem }, + components: { WizNavContainer, WizNavItem, WizNavContent }, setup() { return { WizIDashboard, @@ -179,6 +179,9 @@ export const Fixed: StoryFn = (_, { argTypes }) => ({
Footer
+ +
テスト テスト テスト テスト テスト
+
`, }); @@ -262,6 +265,9 @@ export const PopupFixed: StoryFn = (args) => ({ + +
テスト テスト テスト テスト テスト
+
`, }); @@ -299,6 +305,9 @@ export const PopupFixedOpen: StoryFn = (args) => ({ + +
テスト テスト テスト テスト テスト
+
`, }); @@ -329,6 +338,9 @@ export const Disabled: StoryFn = (args) => ({ + +
テスト テスト テスト テスト テスト
+
`, }); @@ -365,6 +377,9 @@ export const PopupAndTooltip: StoryFn = (args) => ({ + +
テスト テスト テスト テスト テスト
+
`, }); diff --git a/packages/wiz-ui-next/src/components/base/navigation/content.vue b/packages/wiz-ui-next/src/components/base/navigation/content.vue new file mode 100644 index 0000000000..3c56e78048 --- /dev/null +++ b/packages/wiz-ui-next/src/components/base/navigation/content.vue @@ -0,0 +1,28 @@ + + + diff --git a/packages/wiz-ui-next/src/components/base/navigation/index.ts b/packages/wiz-ui-next/src/components/base/navigation/index.ts index 3f4a076bcd..ae8cc325dd 100644 --- a/packages/wiz-ui-next/src/components/base/navigation/index.ts +++ b/packages/wiz-ui-next/src/components/base/navigation/index.ts @@ -1,2 +1,3 @@ export { default as WizNavContainer } from "./container.vue"; export { default as WizNavItem } from "./item.vue"; +export { default as WizNavContent } from "./content.vue"; diff --git a/packages/wiz-ui/src/components/base/navigation/container.stories.ts b/packages/wiz-ui/src/components/base/navigation/container.stories.ts index a8939a0143..06e87e698f 100644 --- a/packages/wiz-ui/src/components/base/navigation/container.stories.ts +++ b/packages/wiz-ui/src/components/base/navigation/container.stories.ts @@ -12,7 +12,7 @@ import { WizTextButton } from "../buttons"; import { WizHeader } from "../header"; import { ButtonGroupItem } from "../popup-button-group/types"; -import { WizNavContainer, WizNavItem } from "."; +import { WizNavContainer, WizNavItem, WizNavContent } from "."; export default { title: "Base/Navigation/Container", @@ -122,7 +122,7 @@ export const Close: StoryFn = (_, { argTypes }) => ({ export const Playground: StoryFn = (_, { argTypes }) => ({ props: Object.keys(argTypes), - components: { WizNavContainer, WizNavItem }, + components: { WizNavContainer, WizNavItem, WizNavContent }, setup() { const isOpen = ref(true); const toggle = () => (isOpen.value = !isOpen.value); @@ -137,7 +137,7 @@ export const Playground: StoryFn = (_, { argTypes }) => ({ }, template: `
- + @@ -148,17 +148,17 @@ export const Playground: StoryFn = (_, { argTypes }) => ({
Footer
-
+ デバッグ用 -
+
`, }); export const Fixed: StoryFn = (_, { argTypes }) => ({ props: Object.keys(argTypes), - components: { WizNavContainer, WizNavItem }, + components: { WizNavContainer, WizNavItem, WizNavContent }, setup() { return { WizIDashboard, @@ -180,6 +180,9 @@ export const Fixed: StoryFn = (_, { argTypes }) => ({
Footer
+ +
テスト テスト テスト テスト テスト
+
`, }); @@ -263,6 +266,9 @@ export const PopupFixed: StoryFn = (_, { argTypes }) => ({ + +
テスト テスト テスト テスト テスト
+
`, }); @@ -300,6 +306,9 @@ export const PopupFixedOpen: StoryFn = (_, { argTypes }) => ({ + +
テスト テスト テスト テスト テスト
+
`, }); @@ -330,6 +339,9 @@ export const Disabled: StoryFn = (_, { argTypes }) => ({ + +
テスト テスト テスト テスト テスト
+
`, }); @@ -366,6 +378,9 @@ export const PopupAndTooltip: StoryFn = (_, { argTypes }) => ({ + +
テスト テスト テスト テスト テスト
+
`, }); diff --git a/packages/wiz-ui/src/components/base/navigation/content.vue b/packages/wiz-ui/src/components/base/navigation/content.vue new file mode 100644 index 0000000000..0da38cb27a --- /dev/null +++ b/packages/wiz-ui/src/components/base/navigation/content.vue @@ -0,0 +1,28 @@ + + + diff --git a/packages/wiz-ui/src/components/base/navigation/index.ts b/packages/wiz-ui/src/components/base/navigation/index.ts index 3f4a076bcd..ae8cc325dd 100644 --- a/packages/wiz-ui/src/components/base/navigation/index.ts +++ b/packages/wiz-ui/src/components/base/navigation/index.ts @@ -1,2 +1,3 @@ export { default as WizNavContainer } from "./container.vue"; export { default as WizNavItem } from "./item.vue"; +export { default as WizNavContent } from "./content.vue";