Avoid affix element is higher than view port

ant-design · Dec 10, 2017 · 31a0654ef990eb7bae2b18095fa0d5230b9be1da · 31a0654 · afc163 · Dec 10, 2017
1 parent e13c6d8
commit 31a0654ef990eb7bae2b18095fa0d5230b9be1da
Unified Split

Showing with 4 additions and 1 deletion.

+3 −1 components/affix/index.tsx

+1 −0 components/affix/style/index.less
diff --git a/components/affix/index.tsx b/components/affix/index.tsx
@@ -157,10 +157,12 @@ export default class Affix extends React.Component<AffixProps, AffixState> {
     if (scrollTop > elemOffset.top - (offsetTop as number) && offsetMode.top) {
       // Fixed Top
       const width = elemOffset.width;
+      const top = targetRect.top + (offsetTop as number);
       this.setAffixStyle(e, {
         position: 'fixed',
-        top: targetRect.top + (offsetTop as number),
+        top,
         left: targetRect.left + elemOffset.left,
+        maxHeight: `calc(100vh - ${top}px)`,
         width,
       });
       this.setPlaceholderStyle({

diff --git a/components/affix/style/index.less b/components/affix/style/index.less
@@ -3,4 +3,5 @@
 .@{ant-prefix}-affix {
   position: fixed;
   z-index: @zindex-affix;
+  overflow: auto;
 }