fixed styling inconsitency

kougen · Jan 27, 2024 · d699e47 · d699e47
1 parent e747c63
commit d699e47
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/src/components/div-wrapper.tsx b/src/components/div-wrapper.tsx
@@ -2,26 +2,22 @@ import React from 'react';
 
 export default function DivWrapper({
   children,
-  outerDivStyle,
   setScroll,
   style,
   className,
 }: {
   children: React.ReactNode;
-  outerDivStyle: React.CSSProperties;
   setScroll: (scroll: HTMLDivElement) => void;
   style?: React.CSSProperties;
   className?: string;
 }) {
   return (
-    <div style={outerDivStyle} className="infinite-scroll-component__outerdiv">
-      <div
-        className={`infinite-scroll-component ${className || ''}`}
-        ref={(infScroll: HTMLDivElement) => setScroll(infScroll)}
-        style={style}
-      >
-        {children}
-      </div>
+    <div
+      className={`infinite-scroll-component ${className || ''}`}
+      ref={(infScroll: HTMLDivElement) => setScroll(infScroll)}
+      style={style}
+    >
+      {children}
     </div>
   );
 }
diff --git a/src/components/tbody-wrapper.tsx b/src/components/tbody-wrapper.tsx
@@ -2,20 +2,18 @@ import React from 'react';
 
 export default function TBodyWrapper({
   children,
-  outerDivStyle,
   setScroll,
   style,
   className,
 }: {
   children: React.ReactNode;
-  outerDivStyle: React.CSSProperties;
   setScroll: (scroll: HTMLTableSectionElement) => void;
   style?: React.CSSProperties;
   className?: string;
 }) {
   return (
     <tbody
-      style={{ ...style, ...outerDivStyle }}
+      style={style}
       className={`infinite-scroll-component ${className || ''}`}
       ref={(infScroll: HTMLTableSectionElement) => setScroll(infScroll)}
     >

diff --git a/src/index.tsx b/src/index.tsx
@@ -385,18 +385,10 @@ export default class InfiniteScroll extends Component<Props, State> {
       ...this.props.style,
     } as CSSProperties;
 
-    // because heighted infiniteScroll visualy breaks
-    // on drag down as overflow becomes visible
-    const outerDivStyle =
-      this.props.pullDownToRefresh && this.props.height
-        ? { overflow: 'auto' }
-        : {};
-
     return (
       <CType
-        outerDivStyle={!this.props.tbody ? outerDivStyle : undefined}
         setScroll={this.setScroll}
-        style={style}
+        style={{ ...style, ...this.props.style }}
         className={this.props.className}
       >
         {this.childContent()}