Merge remote-tracking branch 'origin/master' into next

skbkontur · Oct 26, 2023 · 6d1cee5 · 6d1cee5
2 parents f19378c + 7da03ba
commit 6d1cee5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/packages/react-ui/CHANGELOG.md b/packages/react-ui/CHANGELOG.md
@@ -54,6 +54,19 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+
+## [4.16.2](https://github.com/skbkontur/retail-ui/compare/@skbkontur/[email protected]...@skbkontur/[email protected]) (2023-10-24)
+
+
+### Bug Fixes
+
+* **Button:** enable linkHoverTextDecoration var for THEME_2022 ([#3290](https://github.com/skbkontur/retail-ui/issues/3290)) ([1beb6da](https://github.com/skbkontur/retail-ui/commit/1beb6da47b0d782a2f62c1612b26fe221128f5fc))
+* **SidePage,Sticky:** fix max update depth error ([#3293](https://github.com/skbkontur/retail-ui/issues/3293)) ([950988f](https://github.com/skbkontur/retail-ui/commit/950988f9b3b612b1ac8f3a4f634bd3b001e28a9b))
+
+
+
+
+
 ## [4.16.1](https://github.com/skbkontur/retail-ui/compare/@skbkontur/[email protected]...@skbkontur/[email protected]) (2023-10-16)
 
 

diff --git a/packages/react-ui/components/SidePage/SidePageHeader.tsx b/packages/react-ui/components/SidePage/SidePageHeader.tsx
@@ -60,6 +60,7 @@ export class SidePageHeader extends React.Component<SidePageHeaderProps, SidePag
   private sticky: Sticky | null = null;
   private lastRegularHeight = 0;
   private setRootNode!: TSetRootNode;
+  private closeIcon = (<SidePageCloseButton />);
 
   public get regularHeight(): number {
     const { isReadyToFix } = this.state;
@@ -181,10 +182,10 @@ export class SidePageHeader extends React.Component<SidePageHeaderProps, SidePag
         })}
       >
         {this.isMobileLayout ? (
-          <SidePageCloseButton />
+          this.closeIcon
         ) : (
           <Sticky side="top" offset={stickyOffset}>
-            <SidePageCloseButton />
+            {this.closeIcon}
           </Sticky>
         )}
       </div>

diff --git a/packages/react-ui/internal/themes/Theme2022.ts b/packages/react-ui/internal/themes/Theme2022.ts
@@ -13,6 +13,7 @@ export class Theme2022 extends (class {} as typeof DefaultThemeInternal) {
   public static linkColor = '#222222';
   public static linkHoverColor = '#222222';
   public static linkActiveColor = '#141414';
+  public static linkHoverTextDecoration = 'none';
 
   public static linkSuccessColor = '#538A1B';
   public static linkSuccessHoverColor = '#477916';
@@ -111,8 +112,6 @@ export class Theme2022 extends (class {} as typeof DefaultThemeInternal) {
   public static btnWithIconPaddingLeftMedium = '10px';
   public static btnWithIconPaddingLeftLarge = '12px';
 
-  public static btnLinkHoverTextDecoration = 'none';
-
   public static get btnLinkLineBorderBottomStyle() {
     return this.linkLineBorderBottomStyle;
   }

diff --git a/packages/react-ui/internal/themes/Theme2022Dark.ts b/packages/react-ui/internal/themes/Theme2022Dark.ts
@@ -97,6 +97,7 @@ export class Theme2022Dark extends (class {} as typeof Theme2022Internal) {
   public static linkColor = 'rgba(255, 255, 255, 0.87)';
   public static linkHoverColor = '#ffffff';
   public static linkActiveColor = '#c2c2c2';
+  public static linkHoverTextDecoration = 'none';
 
   public static linkSuccessColor = '#78BF2B';
   public static linkSuccessHoverColor = '#B9E96E';