Skip to content

Commit 31c433e

Browse files
authored
Merge branch 'main' into fix-build-actions
2 parents bb456e8 + 4acc850 commit 31c433e

14 files changed

+71
-22
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## [4.16.1](https://github.com/gravity-ui/dynamic-forms/compare/v4.16.0...v4.16.1) (2025-02-07)
4+
5+
6+
### Bug Fixes
7+
8+
* card one of view layout ([#273](https://github.com/gravity-ui/dynamic-forms/issues/273)) ([dcac2b1](https://github.com/gravity-ui/dynamic-forms/commit/dcac2b1744e1ed34a5f0590329a5ae8504417473))
9+
* hide stotybook actions ([#264](https://github.com/gravity-ui/dynamic-forms/issues/264)) ([824be18](https://github.com/gravity-ui/dynamic-forms/commit/824be18ac4882475e6f277372c0f47d63dcc1ffa))
10+
* playwright report ([#268](https://github.com/gravity-ui/dynamic-forms/issues/268)) ([ac75f76](https://github.com/gravity-ui/dynamic-forms/commit/ac75f765b3a7a8ef5f0258474aaed02d807dcdc8))
11+
* text content theme ([#267](https://github.com/gravity-ui/dynamic-forms/issues/267)) ([aa2963c](https://github.com/gravity-ui/dynamic-forms/commit/aa2963cd999413fbe41d57396fb26551cb351593))
12+
313
## [4.16.0](https://github.com/gravity-ui/dynamic-forms/compare/v4.15.0...v4.16.0) (2025-01-22)
414

515

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gravity-ui/dynamic-forms",
3-
"version": "4.16.0",
3+
"version": "4.16.1",
44
"description": "",
55
"license": "MIT",
66
"main": "build/cjs/index.js",

src/lib/kit/components/Inputs/CardOneOf/CardOneOf.tsx

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {Row} from '../../Layouts';
1515
import {RemoveButton} from '../../RemoveButton';
1616

1717
export const CardOneOf: ObjectIndependentInput = (props) => {
18-
const {input, meta, spec, name} = props;
18+
const {input, meta, spec, name, Layout} = props;
1919

2020
const [open, setOpen] = React.useState(true);
2121

@@ -27,14 +27,19 @@ export const CardOneOf: ObjectIndependentInput = (props) => {
2727
onTogglerChange: onOpen,
2828
});
2929

30-
const toggler = React.useMemo(
31-
() => (
32-
<Row {...props} name="__stub-name">
33-
{togglerInput}
34-
</Row>
35-
),
36-
[togglerInput, props],
37-
);
30+
const toggler = React.useMemo(() => {
31+
const togglerProps = {
32+
...props,
33+
name: '__stub-name',
34+
children: togglerInput,
35+
} as const;
36+
37+
if (Layout) {
38+
return <Layout {...togglerProps} />;
39+
}
40+
41+
return <Row {...togglerProps} />;
42+
}, [togglerInput, props, Layout]);
3843

3944
const actions = React.useMemo(() => {
4045
if (isArrayItem(name)) {
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)