Skip to content

Feat/notification-panel-table #1343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 6, 2025
Merged

Feat/notification-panel-table #1343

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ae1c335
feat(notification-panel): table-info layout
RyushiAok Jul 21, 2024
449e4cb
chore(notification-panel): add changeset
RyushiAok Jul 21, 2024
94a463a
fix(notification-panel): remove gap
RyushiAok Aug 23, 2024
03f0aa9
docs(notification-panel): 縦が揃うか確認するstoryを追加
RyushiAok Aug 23, 2024
fd004c3
fix(notification-panel): title gap
RyushiAok Aug 23, 2024
9546929
fix(notification-panel): gap
RyushiAok Nov 2, 2024
39a85d9
Merge branch 'main' of https://github.com/Wizleap-Inc/wiz-ui into fea…
RyushiAok Jan 9, 2025
a4fe6cf
Merge branch 'main' of https://github.com/Wizleap-Inc/wiz-ui into fea…
RyushiAok Apr 2, 2025
b5d8a0b
fix(notification-panel): remove gap
RyushiAok Apr 2, 2025
049fbed
fix(notification-panel): panel width
RyushiAok Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/thirty-falcons-perform.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@wizleap-inc/wiz-ui-react": minor
"@wizleap-inc/wiz-ui-next": minor
---

Feat(notification-panel): table-info layout
6 changes: 3 additions & 3 deletions packages/wiz-ui-next/src/components/custom/notification/panel/panel.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { StoryFn, Meta } from "@storybook/vue3";
import { Meta, StoryFn } from "@storybook/vue3";

import { WizText, WizVStack, WizHStack, WizBox } from "@/components";
import { WizBox, WizHStack, WizText, WizVStack } from "@/components";

import { WizNotificationPanel } from ".";

Expand Down Expand Up @@ -40,7 +40,7 @@ const baseProps = {
content: "データ1",
},
{
title: "情報2",
title: "情報002",
content: "データ2",
},
],
Expand Down
69 changes: 49 additions & 20 deletions packages/wiz-ui-next/src/components/custom/notification/panel/panel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,53 @@
width,
}"
>
<WizHStack px="md" py="xs" justify="between" align="center">
<WizHStack px="md" py="xs" justify="between" align="center" nowrap>
<WizVStack gap="xs" position="relative" width="100%">
<WizHStack v-if="variant === 'primary'" justify="between" align="start">
<WizVStack gap="xs">
<WizHStack gap="xl" v-for="(item, i) in tableInfo" :key="i">
<WizText :bold="!read" fontSize="xs" color="gray.700">{{
item.title
}}</WizText>
<WizText :bold="!read" fontSize="xs" color="gray.700">{{
item.content
}}</WizText>
</WizHStack>
</WizVStack>
<WizUnstyledTable>
<WizUnstyledTbody>
<WizUnstyledTr
v-for="(item, i) in tableInfo"
:key="`${item.title}_${i}`"
>
<WizUnstyledTd
align="left"
:style="{
paddingRight: THEME.spacing.xl,
paddingBottom: THEME.spacing.xs,
}"
>
<WizText :bold="!read" fontSize="xs" color="gray.700">
{{ item.title }}
</WizText>
</WizUnstyledTd>
<WizUnstyledTd
align="left"
:style="{ paddingBottom: THEME.spacing.xs }"
>
<WizText :bold="!read" fontSize="xs" color="gray.700">
{{ item.content }}
</WizText>
</WizUnstyledTd>
</WizUnstyledTr>
</WizUnstyledTbody>
</WizUnstyledTable>
<WizText color="gray.600" fontSize="xs2">
{{ displayHowPast }}
</WizText>
</WizHStack>
<WizText color="gray.700" fontSize="xs" :maxLines="2" :bold="!read">
{{ title }}
</WizText>
<WizText v-if="variant === 'secondary'" color="gray.600" fontSize="xs2">
{{ displayDatetime }}
</WizText>
<WizStack gap="xs">
<WizText color="gray.700" fontSize="xs" :maxLines="2" :bold="!read">
{{ title }}
</WizText>
<WizText
v-if="variant === 'secondary'"
color="gray.600"
fontSize="xs2"
>
{{ displayDatetime }}
</WizText>
</WizStack>
</WizVStack>
<WizIcon
:icon="WizIChevronRight"
Expand All @@ -47,16 +71,21 @@
</template>

<script setup lang="ts">
import { ColorKeys, ComponentName } from "@wizleap-inc/wiz-ui-constants";
import { ColorKeys, ComponentName, THEME } from "@wizleap-inc/wiz-ui-constants";
import { formatDateToYMDHM, formatHowPast } from "@wizleap-inc/wiz-ui-utils";
import { computed, ref, PropType } from "vue";
import { computed, PropType, ref } from "vue";

import {
WizBox,
WizHStack,
WizIcon,
WizVStack,
WizStack,
WizText,
WizUnstyledTable,
WizUnstyledTbody,
WizUnstyledTd,
WizUnstyledTr,
WizVStack,
} from "@/components/base";
import { WizIChevronRight } from "@/components/icons";

Expand Down
61 changes: 41 additions & 20 deletions packages/wiz-ui-react/src/components/custom/notification/components/notification-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ColorKeys, ComponentName } from "@wizleap-inc/wiz-ui-constants";
import { ColorKeys, ComponentName, THEME } from "@wizleap-inc/wiz-ui-constants";
import { formatDateToYMDHM, formatHowPast } from "@wizleap-inc/wiz-ui-utils";
import { FC, useCallback, useEffect, useMemo, useState } from "react";

Expand All @@ -8,6 +8,10 @@ import {
WizIChevronRight,
WizIcon,
WizText,
WizUnstyledTable,
WizUnstyledTbody,
WizUnstyledTd,
WizUnstyledTr,
WizVStack,
} from "@/components";
import { BaseProps } from "@/types";
Expand Down Expand Up @@ -86,31 +90,48 @@ const NotificationPanel: FC<Props> = ({
<WizVStack gap="xs" position="relative" width="100%">
{variant === "primary" && (
<WizHStack justify="between" align="start">
<WizVStack gap="xs">
{tableInfo?.map((item, i) => (
<WizHStack key={i} gap="xl">
<WizText bold={!read} fontSize="xs" color="gray.700">
{item.title}
</WizText>
<WizText bold={!read} fontSize="xs" color="gray.700">
{item.content}
</WizText>
</WizHStack>
))}
</WizVStack>
<WizUnstyledTable>
<WizUnstyledTbody>
{tableInfo?.map((item, i) => (
<WizUnstyledTr key={`${item.title}_${i}`}>
<WizUnstyledTd
align="left"
style={{
paddingRight: THEME.spacing.xl,
paddingBottom: THEME.spacing.xs,
}}
>
<WizText bold={!read} fontSize="xs" color="gray.700">
{item.title}
</WizText>
</WizUnstyledTd>
<WizUnstyledTd
align="left"
style={{ paddingBottom: THEME.spacing.xs }}
>
<WizText bold={!read} fontSize="xs" color="gray.700">
{item.content}
</WizText>
</WizUnstyledTd>
</WizUnstyledTr>
))}
</WizUnstyledTbody>
</WizUnstyledTable>
<WizText color="gray.600" fontSize="xs2">
{displayHowPast}
</WizText>
</WizHStack>
)}
<WizText color="gray.700" fontSize="xs" maxLines={2} bold={!read}>
{title}
</WizText>
{variant === "secondary" && (
<WizText color="gray.600" fontSize="xs2">
{displayDatetime}
<WizHStack gap="xs">
<WizText color="gray.700" fontSize="xs" maxLines={2} bold={!read}>
{title}
</WizText>
)}
{variant === "secondary" && (
<WizText color="gray.600" fontSize="xs2">
{displayDatetime}
</WizText>
)}
</WizHStack>
</WizVStack>
<WizIcon icon={WizIChevronRight} color="green.800" />
</WizHStack>
Expand Down
2 changes: 1 addition & 1 deletion ...es/wiz-ui-react/src/components/custom/notification/stories/notification-panel.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const baseProps = {
content: "データ1",
},
{
title: "情報2",
title: "情報002",
content: "データ2",
},
],
Expand Down
Loading