From 4618d95b01c9c73778146231d09c6b29265c06ca Mon Sep 17 00:00:00 2001 From: itwillwork Date: Thu, 26 Jun 2025 18:25:23 +0300 Subject: [PATCH 1/3] feat: try add layoutAction --- src/lib/core/types/specs.ts | 5 +++++ src/lib/kit/components/Layouts/Column/Column.scss | 12 ++++++------ src/lib/kit/components/Layouts/Column/Column.tsx | 3 +++ src/lib/kit/components/Layouts/Row/Row.scss | 4 ++++ src/lib/kit/components/Layouts/Row/Row.tsx | 3 +++ 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/lib/core/types/specs.ts b/src/lib/core/types/specs.ts index 89afd28e..1035febc 100644 --- a/src/lib/core/types/specs.ts +++ b/src/lib/core/types/specs.ts @@ -25,6 +25,7 @@ export interface ArraySpec< layout?: string; layoutTitle?: string; layoutDescription?: string; + layoutAction?: string; layoutOpen?: boolean; itemLabel?: string; itemPrefix?: string; @@ -66,6 +67,7 @@ export interface BooleanSpec< layout?: string; layoutTitle?: string; layoutDescription?: string; + layoutAction?: string; layoutOpen?: boolean; link?: LinkType; hidden?: boolean; @@ -92,6 +94,7 @@ export interface NumberSpec< layout?: string; layoutTitle?: string; layoutDescription?: string; + layoutAction?: string; layoutOpen?: boolean; link?: LinkType; placeholder?: string; @@ -119,6 +122,7 @@ export interface ObjectSpec< layout?: string; layoutTitle?: string; layoutDescription?: string; + layoutAction?: string; layoutOpen?: boolean; order?: string[]; link?: LinkType; @@ -155,6 +159,7 @@ export interface StringSpec< layout?: string; layoutTitle?: string; layoutDescription?: string; + layoutAction?: string; layoutOpen?: boolean; link?: LinkType; sizeParams?: { diff --git a/src/lib/kit/components/Layouts/Column/Column.scss b/src/lib/kit/components/Layouts/Column/Column.scss index 5ff3cc23..76df6008 100644 --- a/src/lib/kit/components/Layouts/Column/Column.scss +++ b/src/lib/kit/components/Layouts/Column/Column.scss @@ -11,19 +11,19 @@ min-height: var(--df-column-first-row-min-height, 28px); display: flex; margin-bottom: auto; - flex-direction: column; + flex-direction: row; flex-shrink: 0; &-inner { - display: inline; + flex-grow: 1; margin-top: auto; margin-bottom: auto; } - &::after { - content: ''; - width: 100%; - flex-shrink: 1; + &-action { + padding-left: var(--g-spacing-2); + margin-top: auto; + margin-bottom: auto; } } diff --git a/src/lib/kit/components/Layouts/Column/Column.tsx b/src/lib/kit/components/Layouts/Column/Column.tsx index 62257ca1..dbd4cbfa 100644 --- a/src/lib/kit/components/Layouts/Column/Column.tsx +++ b/src/lib/kit/components/Layouts/Column/Column.tsx @@ -47,6 +47,9 @@ const ColumnBase = ({ ) : null} + {Boolean(spec.viewSpec.layoutAction) && ( +
{spec.viewSpec.layoutAction}
+ )}
diff --git a/src/lib/kit/components/Layouts/Row/Row.scss b/src/lib/kit/components/Layouts/Row/Row.scss index 400807a0..e4aa716b 100644 --- a/src/lib/kit/components/Layouts/Row/Row.scss +++ b/src/lib/kit/components/Layouts/Row/Row.scss @@ -24,6 +24,10 @@ margin-bottom: auto; } + &-action { + padding-left: var(--g-spacing-2); + } + &::after { content: ''; width: 100%; diff --git a/src/lib/kit/components/Layouts/Row/Row.tsx b/src/lib/kit/components/Layouts/Row/Row.tsx index 4345fa0e..3a9c2b17 100644 --- a/src/lib/kit/components/Layouts/Row/Row.tsx +++ b/src/lib/kit/components/Layouts/Row/Row.tsx @@ -49,6 +49,9 @@ const RowBase = ({ ) : null} + {Boolean(spec.viewSpec.layoutAction) && ( + {spec.viewSpec.layoutAction} + )}
From d3b0f7b16c3b9dc9b9d8ad79b170a64067284e9c Mon Sep 17 00:00:00 2001 From: itwillwork Date: Fri, 27 Jun 2025 17:41:13 +0300 Subject: [PATCH 2/3] feat: try add layoutAction --- src/lib/kit/components/Layouts/Column/Column.tsx | 9 +++++---- src/lib/kit/components/Layouts/Row/Row.tsx | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib/kit/components/Layouts/Column/Column.tsx b/src/lib/kit/components/Layouts/Column/Column.tsx index dbd4cbfa..f773fb0f 100644 --- a/src/lib/kit/components/Layouts/Column/Column.tsx +++ b/src/lib/kit/components/Layouts/Column/Column.tsx @@ -14,7 +14,9 @@ import './Column.scss'; const b = block('column'); -interface ColumnProps {} +interface ColumnProps { + action?: React.ReactNode; +} const ColumnBase = ({ name, @@ -22,6 +24,7 @@ const ColumnBase = ({ input, meta, children, + action, }: LayoutProps & ColumnProps) => { const arrayItem = React.useMemo(() => isArrayItem(name), [name]); const generateButton = React.useMemo(() => withGenerateButton(spec), [spec]); @@ -47,9 +50,7 @@ const ColumnBase = ({ ) : null}
- {Boolean(spec.viewSpec.layoutAction) && ( -
{spec.viewSpec.layoutAction}
- )} + {Boolean(action) &&
{action}
}
diff --git a/src/lib/kit/components/Layouts/Row/Row.tsx b/src/lib/kit/components/Layouts/Row/Row.tsx index 3a9c2b17..9f3e4fcc 100644 --- a/src/lib/kit/components/Layouts/Row/Row.tsx +++ b/src/lib/kit/components/Layouts/Row/Row.tsx @@ -16,6 +16,7 @@ const b = block('row'); interface RowProps { verboseDescription?: boolean; + action?: React.ReactNode; } const RowBase = ({ @@ -24,6 +25,7 @@ const RowBase = ({ input, meta, verboseDescription, + action, children, }: LayoutProps & RowProps) => { const arrayItem = React.useMemo(() => isArrayItem(name), [name]); @@ -49,9 +51,7 @@ const RowBase = ({ ) : null} - {Boolean(spec.viewSpec.layoutAction) && ( - {spec.viewSpec.layoutAction} - )} + {Boolean(action) && {action}}
From d1e9cbbfa1176db70db1087dfe61f2da0eabfeb4 Mon Sep 17 00:00:00 2001 From: itwillwork Date: Fri, 27 Jun 2025 17:44:47 +0300 Subject: [PATCH 3/3] feat: revert changes --- src/lib/core/types/specs.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/lib/core/types/specs.ts b/src/lib/core/types/specs.ts index 1035febc..89afd28e 100644 --- a/src/lib/core/types/specs.ts +++ b/src/lib/core/types/specs.ts @@ -25,7 +25,6 @@ export interface ArraySpec< layout?: string; layoutTitle?: string; layoutDescription?: string; - layoutAction?: string; layoutOpen?: boolean; itemLabel?: string; itemPrefix?: string; @@ -67,7 +66,6 @@ export interface BooleanSpec< layout?: string; layoutTitle?: string; layoutDescription?: string; - layoutAction?: string; layoutOpen?: boolean; link?: LinkType; hidden?: boolean; @@ -94,7 +92,6 @@ export interface NumberSpec< layout?: string; layoutTitle?: string; layoutDescription?: string; - layoutAction?: string; layoutOpen?: boolean; link?: LinkType; placeholder?: string; @@ -122,7 +119,6 @@ export interface ObjectSpec< layout?: string; layoutTitle?: string; layoutDescription?: string; - layoutAction?: string; layoutOpen?: boolean; order?: string[]; link?: LinkType; @@ -159,7 +155,6 @@ export interface StringSpec< layout?: string; layoutTitle?: string; layoutDescription?: string; - layoutAction?: string; layoutOpen?: boolean; link?: LinkType; sizeParams?: {