From ee11cc49882b9aa565efafca982a0243a5e90ce6 Mon Sep 17 00:00:00 2001 From: AndyKIron Date: Mon, 14 Oct 2024 11:24:52 +0300 Subject: [PATCH 1/6] fix(radio-group): fusion-radio-group v4 - horizontal gap changed to 16px instead 8px --- .../components/radio-group/v4/radio-group.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fusion-ui/components/radio-group/v4/radio-group.component.scss b/projects/fusion-ui/components/radio-group/v4/radio-group.component.scss index ca8ef3b52..1f47dc75e 100644 --- a/projects/fusion-ui/components/radio-group/v4/radio-group.component.scss +++ b/projects/fusion-ui/components/radio-group/v4/radio-group.component.scss @@ -6,7 +6,7 @@ flex-direction: column; align-items: flex-start; justify-content: flex-start; - gap: var(--spacing-100, #{$spacingV4-100}); + gap: var(--spacing-200, #{$spacingV4-200}); &.fu-direction-row { flex-direction: row; From 97353f0ca397146cc25c57539ab701df22c57c53 Mon Sep 17 00:00:00 2001 From: AndyKIron Date: Mon, 14 Oct 2024 14:48:55 +0300 Subject: [PATCH 2/6] fix(calendar): calendar v4 - fixed hover on empty days (no need hover on it) --- .../components/calendar/v4/calendar-v4.component.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/fusion-ui/components/calendar/v4/calendar-v4.component.scss b/projects/fusion-ui/components/calendar/v4/calendar-v4.component.scss index e9957095e..339924679 100644 --- a/projects/fusion-ui/components/calendar/v4/calendar-v4.component.scss +++ b/projects/fusion-ui/components/calendar/v4/calendar-v4.component.scss @@ -110,10 +110,12 @@ span { position: relative; } - + &:empty{ + cursor: default; + } // region regular day hover - &:not(.selected):not(.disabled):not(.hover-current):hover { + &:not(.selected):not(.disabled):not(.hover-current):not(:empty):hover { &:before { @include calendar-circle(var(--fu-day-hover-bg-color), 50%); } From c65ac9f8c1c44c734da8afb5c886dde5283c1378 Mon Sep 17 00:00:00 2001 From: AndyKIron Date: Mon, 14 Oct 2024 15:20:10 +0300 Subject: [PATCH 3/6] fix(calendar): date-range v4 - rename stories --- .../daterange/v4/daterange-v4.component.stories.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/projects/fusion-ui/components/daterange/v4/daterange-v4.component.stories.ts b/projects/fusion-ui/components/daterange/v4/daterange-v4.component.stories.ts index 2bb563597..6a24e573a 100644 --- a/projects/fusion-ui/components/daterange/v4/daterange-v4.component.stories.ts +++ b/projects/fusion-ui/components/daterange/v4/daterange-v4.component.stories.ts @@ -112,7 +112,7 @@ new FormControl({ } }; -export const SelectedToday: Story = { +export const Today: Story = { render: args => ({ props: { ...args, @@ -124,7 +124,7 @@ export const SelectedToday: Story = { template: BASE_TEMPLATE }) }; -SelectedToday.parameters = { +Today.parameters = { docs: { description: { story: dedent`***formControl:*** @@ -138,7 +138,7 @@ new FormControl({ } }; -export const SelectedLast14Days: Story = { +export const Last14Days: Story = { render: args => ({ props: { ...args, @@ -150,6 +150,7 @@ export const SelectedLast14Days: Story = { template: BASE_TEMPLATE }) }; +Last14Days.storyName = 'Last 14 days'; export const WithoutPresets: Story = { render: args => ({ @@ -167,6 +168,7 @@ WithoutPresets.parameters = { } } }; +WithoutPresets.storyName = 'Without presets'; export const LimitedRange: Story = { render: args => ({ @@ -190,6 +192,7 @@ LimitedRange.parameters = { } } }; +LimitedRange.storyName = 'Limited range'; export const NotAllowFutureDateSelected: Story = { render: args => ({ @@ -207,6 +210,7 @@ NotAllowFutureDateSelected.parameters = { } } }; +NotAllowFutureDateSelected.storyName = 'Not future date'; export const WithTimeSelect: Story = { render: args => ({ @@ -245,3 +249,4 @@ WithTimeSelect.parameters = { } } }; +WithTimeSelect.storyName = 'Selected time'; From af6c5ef8de09f4f519e57db59fbec852aa08fc04 Mon Sep 17 00:00:00 2001 From: AndyKIron Date: Mon, 14 Oct 2024 15:34:56 +0300 Subject: [PATCH 4/6] fix(DatePeriodPicker): change options-wrapper width in story `; +const datePeriodTemplate = ` + +
+ + +
+
+`; + export default { title: 'V4/Components/Dropdown/Triggers/ButtonFilter', component: ChipFilterButtonComponent, @@ -380,7 +396,7 @@ export const DatePeriodPicker: Story = { formControl: new FormControl([MOCK_OPTIONS_PERIOD[1]]), configuration: {id: 1, mode: 'static', close: true, leftIcon: {icon: 'ph/calendar-blank'}} }, - template: baseTemplate + template: datePeriodTemplate }), decorators: [componentWrapperDecorator(story => `
${story}
`)] }; From 4aa8693739ceb88685c851749c8024dcb16414f2 Mon Sep 17 00:00:00 2001 From: AndyKIron Date: Tue, 15 Oct 2024 09:23:42 +0300 Subject: [PATCH 5/6] chore(layout-header): rename layout story names --- .../layout/v4/stories/layout-v4.component.stories.ts | 6 ++++++ .../navigation-menu/v4/stories/navigation-menu.mock.ts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/projects/fusion-ui/components/layout/v4/stories/layout-v4.component.stories.ts b/projects/fusion-ui/components/layout/v4/stories/layout-v4.component.stories.ts index db21aedb8..9a5d1071f 100644 --- a/projects/fusion-ui/components/layout/v4/stories/layout-v4.component.stories.ts +++ b/projects/fusion-ui/components/layout/v4/stories/layout-v4.component.stories.ts @@ -166,6 +166,7 @@ export const WithAppTrigger: LayoutV4Story = { ` }) }; +WithAppTrigger.storyName = 'With app trigger header'; export const WithFilters: LayoutV4Story = { render: (args: LayoutComponent) => ({ @@ -243,6 +244,7 @@ export const WithFilters: LayoutV4Story = { ` }) }; +WithFilters.storyName = 'With app trigger header and filters'; export const WithTabs: LayoutV4Story = { render: (args: LayoutComponent) => ({ @@ -320,6 +322,7 @@ export const WithTabs: LayoutV4Story = { ` }) }; +WithTabs.storyName = 'With app trigger header and tabs'; export const Drilldown: LayoutV4Story = { render: (args: LayoutComponent) => ({ @@ -344,7 +347,9 @@ export const Drilldown: LayoutV4Story = { ` }) }; +Drilldown.storyName = 'With back (drilldown) button'; +/* export const NavigateToDefaultByClickOnParent: LayoutV4Story = { render: (args: LayoutComponent) => ({ props: { @@ -408,3 +413,4 @@ export const ShowSecondaryByHoverOnPrimary: LayoutV4Story = { ` }) }; +*/ diff --git a/projects/fusion-ui/components/navigation-menu/v4/stories/navigation-menu.mock.ts b/projects/fusion-ui/components/navigation-menu/v4/stories/navigation-menu.mock.ts index cd92c2f90..6129db779 100644 --- a/projects/fusion-ui/components/navigation-menu/v4/stories/navigation-menu.mock.ts +++ b/projects/fusion-ui/components/navigation-menu/v4/stories/navigation-menu.mock.ts @@ -404,7 +404,7 @@ export const NAVIGATION_MENU_HOME_MOCK: PrimaryMenuItem[] = [ type: NavigationBarItemType.Home, menuIcon: 'ph/house', menuTitle: 'Dashboard', - route: '/iframe.html', + route: 'iframe.html', cssTheme: { 'fu-navbar-background-color': '#181818' } From 5e0e37ed462d0099de947834a6462086e3ecf712 Mon Sep 17 00:00:00 2001 From: AndyKIron Date: Tue, 15 Oct 2024 10:26:36 +0300 Subject: [PATCH 6/6] chore(layout-header): change header filter element as example --- .../v4/stories/layout-v4.component.stories.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/projects/fusion-ui/components/layout/v4/stories/layout-v4.component.stories.ts b/projects/fusion-ui/components/layout/v4/stories/layout-v4.component.stories.ts index 9a5d1071f..95fa25bd1 100644 --- a/projects/fusion-ui/components/layout/v4/stories/layout-v4.component.stories.ts +++ b/projects/fusion-ui/components/layout/v4/stories/layout-v4.component.stories.ts @@ -236,9 +236,21 @@ export const WithFilters: LayoutV4Story = {
- - - + + + + + + + + + + + + + + +
`