fix(@uform/next/antd): fix FormButtonGroup will throw error when root…

… component rerendering
alibaba · Mar 5, 2019 · ccd9334 · ccd9334
1 parent 137d56b
commit ccd9334
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 46 deletions.
diff --git a/packages/antd/src/components/formButtonGroup.js b/packages/antd/src/components/formButtonGroup.js
@@ -88,29 +88,31 @@ export const FormButtonGroup = styled(
 
       if (sticky) {
         return (
-          <FormConsumer>
-            {({ inline, FormRef } = {}) => {
-              if (!FormRef) return
-              return (
-                <Sticky
-                  edge='bottom'
-                  triggerDistance={this.props.triggerDistance}
-                  offsetDistance={this.props.offsetDistance}
-                  zIndex={this.props.zIndex}
-                  getStickyBoundary={this.getStickyBoundaryHandler(FormRef)}
-                  style={{
-                    borderTop: '1px solid #eee',
-                    background: (style && style.background) || '#fff',
-                    padding: (style && style.padding) || '20px 0'
-                  }}
-                >
-                  <div className={className} style={style}>
-                    {content}
-                  </div>
-                </Sticky>
-              )
-            }}
-          </FormConsumer>
+          <div>
+            <FormConsumer>
+              {({ inline, FormRef } = {}) => {
+                if (!FormRef) return
+                return (
+                  <Sticky
+                    edge='bottom'
+                    triggerDistance={this.props.triggerDistance}
+                    offsetDistance={this.props.offsetDistance}
+                    zIndex={this.props.zIndex}
+                    getStickyBoundary={this.getStickyBoundaryHandler(FormRef)}
+                    style={{
+                      borderTop: '1px solid #eee',
+                      background: (style && style.background) || '#fff',
+                      padding: (style && style.padding) || '20px 0'
+                    }}
+                  >
+                    <div className={className} style={style}>
+                      {content}
+                    </div>
+                  </Sticky>
+                )
+              }}
+            </FormConsumer>
+          </div>
         )
       }
 

diff --git a/packages/next/src/components/formButtonGroup.js b/packages/next/src/components/formButtonGroup.js
@@ -88,29 +88,31 @@ export const FormButtonGroup = styled(
 
       if (sticky) {
         return (
-          <FormConsumer>
-            {({ inline, FormRef } = {}) => {
-              if (!FormRef) return
-              return (
-                <Sticky
-                  edge='bottom'
-                  triggerDistance={this.props.triggerDistance}
-                  offsetDistance={this.props.offsetDistance}
-                  zIndex={this.props.zIndex}
-                  getStickyBoundary={this.getStickyBoundaryHandler(FormRef)}
-                  style={{
-                    borderTop: '1px solid #eee',
-                    background: (style && style.background) || '#fff',
-                    padding: (style && style.padding) || '20px 0'
-                  }}
-                >
-                  <div className={className} style={style}>
-                    {content}
-                  </div>
-                </Sticky>
-              )
-            }}
-          </FormConsumer>
+          <div>
+            <FormConsumer>
+              {({ inline, FormRef } = {}) => {
+                if (!FormRef) return
+                return (
+                  <Sticky
+                    edge='bottom'
+                    triggerDistance={this.props.triggerDistance}
+                    offsetDistance={this.props.offsetDistance}
+                    zIndex={this.props.zIndex}
+                    getStickyBoundary={this.getStickyBoundaryHandler(FormRef)}
+                    style={{
+                      borderTop: '1px solid #eee',
+                      background: (style && style.background) || '#fff',
+                      padding: (style && style.padding) || '20px 0'
+                    }}
+                  >
+                    <div className={className} style={style}>
+                      {content}
+                    </div>
+                  </Sticky>
+                )
+              }}
+            </FormConsumer>
+          </div>
         )
       }