From 0bb8604f39e624dc7f1d123a403a81004a118270 Mon Sep 17 00:00:00 2001
From: hextion <100ishundred@gmail.com>
Date: Fri, 22 Aug 2025 12:03:20 +0300
Subject: [PATCH 1/5] feat(bottom-sheet): added footer gap

---
 .changeset/seven-donkeys-watch.md             |  6 +++++
 .../src/__snapshots__/component.test.tsx.snap |  5 +++-
 packages/bottom-sheet/src/component.tsx       |  8 +++----
 .../src/components/footer/index.module.css    | 24 +++++++++++--------
 packages/bottom-sheet/src/types.ts            |  7 ++++++
 .../src/mobile/Component.mobile.tsx           |  1 +
 .../src/__snapshots__/Component.test.tsx.snap | 10 ++++++--
 .../src/components/base-select/Component.tsx  |  7 +++++-
 8 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 .changeset/seven-donkeys-watch.md

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/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"
         >
           <div
-            class="content hasHeader"
+            class="content hasFooter hasHeader"
           >
             <div
               class="wrapper"
@@ -74,6 +74,9 @@ exports[`Bottom sheet Snapshots tests should match snapshot 1`] = `
                       Bottom sheet content
                     </div>
                   </div>
+                  <div
+                    class="footer sticky"
+                  />
                 </div>
               </div>
             </div>
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<HTMLDivElement, BottomSheetProps>(
             backButtonProps,
             iOSLock = false,
             virtualKeyboard = false,
+            showFooter = true,
         },
         ref,
     ) => {
@@ -667,10 +668,7 @@ export const BottomSheet = forwardRef<HTMLDivElement, BottomSheetProps>(
                             ref={mergeRefs([scrollableContainer, scrollableContainerRef])}
                         >
                             {!hideHeader && !emptyHeader && (
-                                <Header
-                                    {...headerProps}
-                                    showSwipeMarker={showSwipeMarker}
-                                />
+                                <Header {...headerProps} showSwipeMarker={showSwipeMarker} />
                             )}
 
                             <div
@@ -684,7 +682,7 @@ export const BottomSheet = forwardRef<HTMLDivElement, BottomSheetProps>(
                                 {children}
                             </div>
 
-                            {actionButton && (
+                            {showFooter && (
                                 <Footer
                                     sticky={stickyFooter}
                                     className={cn(bgClassName, footerClassName)}
diff --git a/packages/bottom-sheet/src/components/footer/index.module.css b/packages/bottom-sheet/src/components/footer/index.module.css
index e961a87792..3e6bedb660 100644
--- a/packages/bottom-sheet/src/components/footer/index.module.css
+++ b/packages/bottom-sheet/src/components/footer/index.module.css
@@ -2,19 +2,23 @@
 @import '../../vars.css';
 
 .footer {
-    padding: var(--gap-16) var(--gap-16);
+    padding-top: var(--gap-16);
     background-color: var(--color-light-modal-bg-primary);
-}
 
-.sticky {
-    position: sticky;
-    bottom: var(--gap-0);
-    z-index: 1;
-}
+    &.sticky {
+        position: sticky;
+        bottom: var(--gap-0);
+        z-index: 1;
+    }
+
+    &:not(:empty) {
+        padding: var(--gap-16);
 
-.highlighted {
-    border-top: var(--bottom-sheet-footer-border-top);
-    background-color: var(--bottom-sheet-footer-background-color);
+        &.highlighted {
+            border-top: var(--bottom-sheet-footer-border-top);
+            background-color: var(--bottom-sheet-footer-background-color);
+        }
+    }
 }
 
 @mixin bg-class-list;
diff --git a/packages/bottom-sheet/src/types.ts b/packages/bottom-sheet/src/types.ts
index 34ae896eb4..d80696700b 100644
--- a/packages/bottom-sheet/src/types.ts
+++ b/packages/bottom-sheet/src/types.ts
@@ -361,4 +361,11 @@ export type BottomSheetProps = {
      * Учитывать высоту виртуальной клавиатуры
      */
     virtualKeyboard?: boolean;
+
+    /**
+     * Показывать футер
+     *
+     * @default true
+     */
+    showFooter?: boolean;
 };
diff --git a/packages/input-autocomplete/src/mobile/Component.mobile.tsx b/packages/input-autocomplete/src/mobile/Component.mobile.tsx
index 4db89d7c8b..88c4ee6132 100644
--- a/packages/input-autocomplete/src/mobile/Component.mobile.tsx
+++ b/packages/input-autocomplete/src/mobile/Component.mobile.tsx
@@ -118,6 +118,7 @@ export const InputAutocompleteMobile = React.forwardRef(
             [isBottomSheet ? 'containerProps' : 'componentDivProps']: {
                 onTouchMove: handleOptionsListTouchMove,
             },
+            showFooter: false,
         };
 
         const clear = inputProps?.clear ?? false;
diff --git a/packages/picker-button/src/__snapshots__/Component.test.tsx.snap b/packages/picker-button/src/__snapshots__/Component.test.tsx.snap
index 46b279e244..7af63ba065 100644
--- a/packages/picker-button/src/__snapshots__/Component.test.tsx.snap
+++ b/packages/picker-button/src/__snapshots__/Component.test.tsx.snap
@@ -330,7 +330,7 @@ exports[`Snapshots tests should display opened correctly 4`] = `
         class="component modal appear appearActive"
       >
         <div
-          class="content hasHeader"
+          class="content hasFooter hasHeader"
         >
           <div
             class="wrapper"
@@ -1354,6 +1354,9 @@ exports[`Snapshots tests should display opened correctly 4`] = `
                     </div>
                   </div>
                 </div>
+                <div
+                  class="footer sticky"
+                />
               </div>
             </div>
           </div>
@@ -1444,7 +1447,7 @@ exports[`Snapshots tests should display opened correctly 6`] = `
         class="component modal appear appearActive"
       >
         <div
-          class="content hasHeader"
+          class="content hasFooter hasHeader"
         >
           <div
             class="wrapper"
@@ -2468,6 +2471,9 @@ exports[`Snapshots tests should display opened correctly 6`] = `
                     </div>
                   </div>
                 </div>
+                <div
+                  class="footer sticky"
+                />
               </div>
             </div>
           </div>
diff --git a/packages/select/src/components/base-select/Component.tsx b/packages/select/src/components/base-select/Component.tsx
index d19c8c6f85..444af24f2c 100644
--- a/packages/select/src/components/base-select/Component.tsx
+++ b/packages/select/src/components/base-select/Component.tsx
@@ -21,7 +21,7 @@ import {
     UseMultipleSelectionState,
 } from 'downshift';
 
-import { fnUtils, getDataTestId } from '@alfalab/core-components-shared';
+import { fnUtils, getDataTestId, isNonNullable } from '@alfalab/core-components-shared';
 import { useLayoutEffect_SAFE_FOR_SSR } from '@alfalab/hooks';
 
 import { SIZE_TO_CLASSNAME_MAP } from '../../consts';
@@ -731,6 +731,11 @@ export const BaseSelect = forwardRef<unknown, ComponentProps>(
                             ...bottomSheetProps?.containerProps,
                             onScroll,
                         }}
+                        showFooter={
+                            isNonNullable(bottomSheetProps)
+                                ? bottomSheetProps.showFooter
+                                : !multiple
+                        }
                     >
                         {renderOptionsList()}
                     </BottomSheet>

From 539c3caa9e342d4dd8524f18320234038369c27a Mon Sep 17 00:00:00 2001
From: hextion <100ishundred@gmail.com>
Date: Fri, 22 Aug 2025 12:06:32 +0300
Subject: [PATCH 2/5] chore(bottom-sheet): fixed stories

---
 packages/bottom-sheet/package.json                   | 3 +++
 packages/bottom-sheet/src/docs/Component.stories.tsx | 2 +-
 packages/bottom-sheet/tsconfig.build.json            | 3 +++
 packages/bottom-sheet/tsconfig.json                  | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

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/docs/Component.stories.tsx b/packages/bottom-sheet/src/docs/Component.stories.tsx
index 9a0370127b..7ac9fe4f54 100644
--- a/packages/bottom-sheet/src/docs/Component.stories.tsx
+++ b/packages/bottom-sheet/src/docs/Component.stories.tsx
@@ -16,7 +16,7 @@ const meta: Meta<typeof BottomSheet> = {
 
 type Story = StoryObj<typeof BottomSheet>;
 
-const BACKGROUND = ['primary', 'secondary', undefined];
+const BACKGROUND = ['primary', 'secondary', undefined] as const;
 
 const shortText =
     'Пользуйтесь сразу: реквизиты виртуальной и пластиковой карты будут доступны уже через 60 секунд после после оформления.';
diff --git a/packages/bottom-sheet/tsconfig.build.json b/packages/bottom-sheet/tsconfig.build.json
index b00a94d9b8..5f08a0f878 100644
--- a/packages/bottom-sheet/tsconfig.build.json
+++ b/packages/bottom-sheet/tsconfig.build.json
@@ -13,6 +13,8 @@
             "@alfalab/core-components-base-modal/*": ["../base-modal/src/*"],
             "@alfalab/core-components-bottom-sheet": ["./src"],
             "@alfalab/core-components-bottom-sheet/*": ["./src/*"],
+            "@alfalab/core-components-button": ["../button/src"],
+            "@alfalab/core-components-button/*": ["../button/src/*"],
             "@alfalab/core-components-navigation-bar-private": ["../navigation-bar-private/src"],
             "@alfalab/core-components-navigation-bar-private/*": [
                 "../navigation-bar-private/src/*"
@@ -26,6 +28,7 @@
     "references": [
         { "path": "../backdrop/tsconfig.build.json" },
         { "path": "../base-modal/tsconfig.build.json" },
+        { "path": "../button/tsconfig.build.json" },
         { "path": "../navigation-bar-private/tsconfig.build.json" },
         { "path": "../shared/tsconfig.build.json" },
         { "path": "../types/tsconfig.build.json" }
diff --git a/packages/bottom-sheet/tsconfig.json b/packages/bottom-sheet/tsconfig.json
index 70f2e05e74..f09c308c6e 100644
--- a/packages/bottom-sheet/tsconfig.json
+++ b/packages/bottom-sheet/tsconfig.json
@@ -12,6 +12,8 @@
             "@alfalab/core-components-base-modal/*": ["../base-modal/src/*"],
             "@alfalab/core-components-bottom-sheet": ["./src"],
             "@alfalab/core-components-bottom-sheet/*": ["./src/*"],
+            "@alfalab/core-components-button": ["../button/src"],
+            "@alfalab/core-components-button/*": ["../button/src/*"],
             "@alfalab/core-components-navigation-bar-private": ["../navigation-bar-private/src"],
             "@alfalab/core-components-navigation-bar-private/*": [
                 "../navigation-bar-private/src/*"
@@ -29,6 +31,7 @@
     "references": [
         { "path": "../backdrop/tsconfig.build.json" },
         { "path": "../base-modal/tsconfig.build.json" },
+        { "path": "../button/tsconfig.build.json" },
         { "path": "../navigation-bar-private/tsconfig.build.json" },
         { "path": "../screenshot-utils/tsconfig.build.json" },
         { "path": "../shared/tsconfig.build.json" },

From 9bba6a658e83fd356623df89df7a6a177613dd81 Mon Sep 17 00:00:00 2001
From: hextion <100ishundred@gmail.com>
Date: Fri, 22 Aug 2025 13:53:23 +0300
Subject: [PATCH 3/5] fix(select-with-tags): gap

---
 .../src/components/base-select-with-tags/Component.tsx           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/select-with-tags/src/components/base-select-with-tags/Component.tsx b/packages/select-with-tags/src/components/base-select-with-tags/Component.tsx
index ff986f5669..5218e567ff 100644
--- a/packages/select-with-tags/src/components/base-select-with-tags/Component.tsx
+++ b/packages/select-with-tags/src/components/base-select-with-tags/Component.tsx
@@ -224,6 +224,7 @@ export const BaseSelectWithTags = forwardRef<HTMLInputElement, BaseSelectWithTag
                                   },
                               },
                               bottomSheetProps: {
+                                  showFooter: false,
                                   showSwipeMarker: false,
                                   onClose: handleClose,
                                   containerProps: {

From 879b4036b050a34f466857a3d31e6e268782a27a Mon Sep 17 00:00:00 2001
From: hextion <100ishundred@gmail.com>
Date: Fri, 22 Aug 2025 13:53:45 +0300
Subject: [PATCH 4/5] chore: updated screenshots

---
 .../bottom-sheet-full-header-small-height-snap.png            | 4 ++--
 .../bottom-sheet-left-title-with-closer-snap.png              | 4 ++--
 .../bottom-sheet-no-header-no-footer-snap.png                 | 4 ++--
 .../src/__image_snapshots__/bottom-sheet-no-title-snap.png    | 4 ++--
 .../bottom-sheet-title-align-left-snap.png                    | 4 ++--
 .../custom-picker-button-mobile-opened-snap.png               | 4 ++--
 ...ional-phone-input-mobile-interactions-flag-select-snap.png | 4 ++--
 .../__image_snapshots__/picker-button-mobile-opened-snap.png  | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

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 9f61627f8f..57fc5650da 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:f32dc605f5bba0a8cc7ed89356dd902e48b8200ac1f74e95baeed2fab4685559
-size 11957
+oid sha256:b0fe9494cdc5052ae0ca3ba66f1dee9ca02dc41704b931368c70993c93b19c35
+size 11906
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/custom-picker-button/src/__image_snapshots__/custom-picker-button-mobile-opened-snap.png b/packages/custom-picker-button/src/__image_snapshots__/custom-picker-button-mobile-opened-snap.png
index 73e654371d..1c9e5ab8e1 100644
--- a/packages/custom-picker-button/src/__image_snapshots__/custom-picker-button-mobile-opened-snap.png
+++ b/packages/custom-picker-button/src/__image_snapshots__/custom-picker-button-mobile-opened-snap.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89768703fe115b24876294f4d98203edc7f0e43af637b816cbc48f8a7e392077
-size 21766
+oid sha256:b81c193d9b066b345249ea42a2963370fa625af2ccc5788c6e6cd97c83524bde
+size 21776
diff --git a/packages/international-phone-input/src/__image_snapshots__/international-phone-input-mobile-interactions-flag-select-snap.png b/packages/international-phone-input/src/__image_snapshots__/international-phone-input-mobile-interactions-flag-select-snap.png
index efd0866f5d..f9c8fd54d0 100644
--- a/packages/international-phone-input/src/__image_snapshots__/international-phone-input-mobile-interactions-flag-select-snap.png
+++ b/packages/international-phone-input/src/__image_snapshots__/international-phone-input-mobile-interactions-flag-select-snap.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e0666266df847ff03e4728c3a702d4e69faa45729c45616294d350be6b11db9
-size 40046
+oid sha256:b5e822db048c573dc390636deddbe1f4f75a7e3d3774aeb09593828d398932f7
+size 37989
diff --git a/packages/picker-button/src/__image_snapshots__/picker-button-mobile-opened-snap.png b/packages/picker-button/src/__image_snapshots__/picker-button-mobile-opened-snap.png
index 82b5d387b9..991c239ad7 100644
--- a/packages/picker-button/src/__image_snapshots__/picker-button-mobile-opened-snap.png
+++ b/packages/picker-button/src/__image_snapshots__/picker-button-mobile-opened-snap.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5490afa038c0769452b9e0fc53e47383cf14062cd7a8a9cea0fa52bf08b3612c
-size 22095
+oid sha256:296e0eacfb38e8cba60b84abafc9aae0ffec351e5ed8da20e5ad046aa6add532
+size 22068

From dda882ce32b00528d513a40c065559fcff4ca2b7 Mon Sep 17 00:00:00 2001
From: hextion <100ishundred@gmail.com>
Date: Fri, 22 Aug 2025 17:14:39 +0300
Subject: [PATCH 5/5] fix(select): showFooter false

---
 packages/select/src/components/base-select/Component.tsx | 7 +------
 packages/select/src/mobile/Component.mobile.tsx          | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/select/src/components/base-select/Component.tsx b/packages/select/src/components/base-select/Component.tsx
index 444af24f2c..d19c8c6f85 100644
--- a/packages/select/src/components/base-select/Component.tsx
+++ b/packages/select/src/components/base-select/Component.tsx
@@ -21,7 +21,7 @@ import {
     UseMultipleSelectionState,
 } from 'downshift';
 
-import { fnUtils, getDataTestId, isNonNullable } from '@alfalab/core-components-shared';
+import { fnUtils, getDataTestId } from '@alfalab/core-components-shared';
 import { useLayoutEffect_SAFE_FOR_SSR } from '@alfalab/hooks';
 
 import { SIZE_TO_CLASSNAME_MAP } from '../../consts';
@@ -731,11 +731,6 @@ export const BaseSelect = forwardRef<unknown, ComponentProps>(
                             ...bottomSheetProps?.containerProps,
                             onScroll,
                         }}
-                        showFooter={
-                            isNonNullable(bottomSheetProps)
-                                ? bottomSheetProps.showFooter
-                                : !multiple
-                        }
                     >
                         {renderOptionsList()}
                     </BottomSheet>
diff --git a/packages/select/src/mobile/Component.mobile.tsx b/packages/select/src/mobile/Component.mobile.tsx
index b5d6ef0917..070f747cce 100644
--- a/packages/select/src/mobile/Component.mobile.tsx
+++ b/packages/select/src/mobile/Component.mobile.tsx
@@ -123,6 +123,7 @@ export const SelectMobile = forwardRef(
                           bottomSheetProps: {
                               bottomAddons,
                               showSwipeMarker: false,
+                              showFooter: !multiple,
                               ...restProps.bottomSheetProps,
                           },
                       })}