diff --git a/.changeset/seven-donkeys-watch.md b/.changeset/seven-donkeys-watch.md new file mode 100644 index 0000000000..f6836105fb --- /dev/null +++ b/.changeset/seven-donkeys-watch.md @@ -0,0 +1,6 @@ +--- +'@alfalab/core-components-bottom-sheet': minor +'@alfalab/core-components': minor +--- + +Добавлен отступ футера diff --git a/packages/bottom-sheet/package.json b/packages/bottom-sheet/package.json index 1a1ad86fa6..8d90bbe15b 100644 --- a/packages/bottom-sheet/package.json +++ b/packages/bottom-sheet/package.json @@ -23,6 +23,9 @@ "tslib": "^2.4.0", "use-sync-external-store": "^1.4.0" }, + "devDependencies": { + "@alfalab/core-components-button": "^12.0.0" + }, "peerDependencies": { "react": "^16.9.0 || ^17.0.1 || ^18.0.0", "react-dom": "^16.9.0 || ^17.0.1 || ^18.0.0" diff --git a/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-full-header-small-height-snap.png b/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-full-header-small-height-snap.png index 54f6c842b0..bd9395d6bd 100644 --- a/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-full-header-small-height-snap.png +++ b/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-full-header-small-height-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3422110491bf2920e6b0793282c9b7ed3e1720890d15a2afa5dd0edb1b13819c -size 11947 +oid sha256:8d968706df492583dfa0e4668208cee44f8a1dbc6aa73a9927cc8faa675845ea +size 11972 diff --git a/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-left-title-with-closer-snap.png b/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-left-title-with-closer-snap.png index 26ccd97b2f..4d51bf54d1 100644 --- a/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-left-title-with-closer-snap.png +++ b/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-left-title-with-closer-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84a96c4a171f950548447dc6f98556836f11ae01729eab783818b6de5609b40a -size 10364 +oid sha256:0dafb6fe9b3b2e777c6e5a654840d4e751bfcb7674cf28545feb199e39c27ada +size 10302 diff --git a/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-no-header-no-footer-snap.png b/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-no-header-no-footer-snap.png index 10e8315407..3768786d28 100644 --- a/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-no-header-no-footer-snap.png +++ b/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-no-header-no-footer-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef1e3136950870394a8819a977a34e0e3f0654ec0b82db16f26432dce7c89bf3 -size 6559 +oid sha256:0394f62317dafba8d5592c39be07c9d44eb1362e054f858fa06ce7fb40bb528c +size 6580 diff --git a/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-no-title-snap.png b/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-no-title-snap.png index 8a3c10c0ad..faed834342 100644 --- a/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-no-title-snap.png +++ b/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-no-title-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8da3d50961dd23d44d4e859b6102475458a78b4654b0cfa4494addcdfab9ef81 -size 9030 +oid sha256:152579398f96ab62933bf3b62f8367c95ab56aba6cca8501ac401a70bfc3ed22 +size 8994 diff --git a/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-title-align-left-snap.png b/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-title-align-left-snap.png index 20f1cab6e4..0bac4cdc7f 100644 --- a/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-title-align-left-snap.png +++ b/packages/bottom-sheet/src/__image_snapshots__/bottom-sheet-title-align-left-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cff7c6466f1298c50c7beaa66bdddc65f2113125fc0187e8e1a12027f3165c9 -size 9572 +oid sha256:2567c18f72c2aea9224378ceb4cd8332d9b2b583f39a48be86a7cb4aaa63f51a +size 9559 diff --git a/packages/bottom-sheet/src/__snapshots__/component.test.tsx.snap b/packages/bottom-sheet/src/__snapshots__/component.test.tsx.snap index 7cd23b2583..20c0e86737 100644 --- a/packages/bottom-sheet/src/__snapshots__/component.test.tsx.snap +++ b/packages/bottom-sheet/src/__snapshots__/component.test.tsx.snap @@ -34,7 +34,7 @@ exports[`Bottom sheet Snapshots tests should match snapshot 1`] = ` class="component modal appear appearActive" >
+
diff --git a/packages/bottom-sheet/src/component.tsx b/packages/bottom-sheet/src/component.tsx index 23e617c8b2..06d8289520 100644 --- a/packages/bottom-sheet/src/component.tsx +++ b/packages/bottom-sheet/src/component.tsx @@ -110,6 +110,7 @@ export const BottomSheet = forwardRef( backButtonProps, iOSLock = false, virtualKeyboard = false, + showFooter = true, }, ref, ) => { @@ -667,10 +668,7 @@ export const BottomSheet = forwardRef( ref={mergeRefs([scrollableContainer, scrollableContainerRef])} > {!hideHeader && !emptyHeader && ( -
+
)}
( {children}
- {actionButton && ( + {showFooter && (