@zohodesk/components 1.0.0-alpha-245 → 1.0.0-alpha-248

package/lib/Buttongroup/__test__/__snapshots__/Buttongroup.spec.js.snap

@@ -1,146 +1,146 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Button component should the button position is center 1`] = `
-<div
-  className="buttonGroup footer"
->
-  <div
-    className="aligncenter"
-  >
-    <button
-      className=" primaryfilled    medium bold  "
-      data-id="buttonComp"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-    >
-      Submit
-    </button>
-    <button
-      className=" secondary    medium bold  "
-      data-id="buttonComp"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-    >
-      Cancel
-    </button>
-  </div>
-</div>
-`;
-
-exports[`Button component should the button position is left 1`] = `
-<div
-  className="buttonGroup footer"
->
-  <div
-    className="alignleft"
-  >
-    <button
-      className=" primaryfilled    medium bold  "
-      data-id="buttonComp"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-    >
-      Submit
-    </button>
-    <button
-      className=" secondary    medium bold  "
-      data-id="buttonComp"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-    >
-      Cancel
-    </button>
-  </div>
-</div>
-`;
-
-exports[`Button component should the button position is right 1`] = `
-<div
-  className="buttonGroup footer"
->
-  <div
-    className="alignright"
-  >
-    <button
-      className=" primaryfilled    medium bold  "
-      data-id="buttonComp"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-    >
-      Submit
-    </button>
-    <button
-      className=" secondary    medium bold  "
-      data-id="buttonComp"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-    >
-      Cancel
-    </button>
-  </div>
-</div>
-`;
-
-exports[`Button component should the type is footer 1`] = `
-<div
-  className="buttonGroup footer"
->
-  <div
-    className="alignleft"
-  >
-    <button
-      className=" primaryfilled    medium bold  "
-      data-id="buttonComp"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-    >
-      Submit
-    </button>
-    <button
-      className=" secondary    medium bold  "
-      data-id="buttonComp"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-    >
-      Cancel
-    </button>
-  </div>
-</div>
-`;
-
-exports[`Button component should the type is header 1`] = `
-<div
-  className="buttonGroup header"
->
-  <div
-    className="alignleft"
-  >
-    <button
-      className=" primaryfilled    medium bold  "
-      data-id="buttonComp"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-    >
-      Submit
-    </button>
-    <button
-      className=" secondary    medium bold  "
-      data-id="buttonComp"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-    >
-      Cancel
-    </button>
-  </div>
-</div>
-`;
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Button component should the button position is center 1`] = `
+<div
+  className="buttonGroup footer"
+>
+  <div
+    className="aligncenter"
+  >
+    <button
+      className=" primaryfilled    medium bold  "
+      data-id="buttonComp"
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+    >
+      Submit
+    </button>
+    <button
+      className=" secondary    medium bold  "
+      data-id="buttonComp"
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+    >
+      Cancel
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Button component should the button position is left 1`] = `
+<div
+  className="buttonGroup footer"
+>
+  <div
+    className="alignleft"
+  >
+    <button
+      className=" primaryfilled    medium bold  "
+      data-id="buttonComp"
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+    >
+      Submit
+    </button>
+    <button
+      className=" secondary    medium bold  "
+      data-id="buttonComp"
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+    >
+      Cancel
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Button component should the button position is right 1`] = `
+<div
+  className="buttonGroup footer"
+>
+  <div
+    className="alignright"
+  >
+    <button
+      className=" primaryfilled    medium bold  "
+      data-id="buttonComp"
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+    >
+      Submit
+    </button>
+    <button
+      className=" secondary    medium bold  "
+      data-id="buttonComp"
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+    >
+      Cancel
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Button component should the type is footer 1`] = `
+<div
+  className="buttonGroup footer"
+>
+  <div
+    className="alignleft"
+  >
+    <button
+      className=" primaryfilled    medium bold  "
+      data-id="buttonComp"
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+    >
+      Submit
+    </button>
+    <button
+      className=" secondary    medium bold  "
+      data-id="buttonComp"
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+    >
+      Cancel
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Button component should the type is header 1`] = `
+<div
+  className="buttonGroup header"
+>
+  <div
+    className="alignleft"
+  >
+    <button
+      className=" primaryfilled    medium bold  "
+      data-id="buttonComp"
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+    >
+      Submit
+    </button>
+    <button
+      className=" secondary    medium bold  "
+      data-id="buttonComp"
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+    >
+      Cancel
+    </button>
+  </div>
+</div>
+`;

package/lib/Card/Card.js

@@ -45,10 +45,10 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 
 /* eslint-disable react/forbid-component-props */
 
-/*
-isscroll header border change use ref
-scroll logic remove from here
-scroll logic move to virtualizer list
+/*
+isscroll header border change use ref
+scroll logic remove from here
+scroll logic move to virtualizer list
 */
 
 /* performance handling pending in card component moving to ref instead of setState */
@@ -131,12 +131,14 @@ var CardContent = /*#__PURE__*/function (_Component2) {
           isScrollAttribute = _this$props2.isScrollAttribute,
           dataId = _this$props2.dataId,
           shrink = _this$props2.shrink,
-          customClass = _this$props2.customClass;
+          customClass = _this$props2.customClass,
+          preventParentScroll = _this$props2.preventParentScroll;
       return /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
         flexible: true,
         onScroll: onScroll,
         eleRef: eleRef,
         scroll: scroll,
+        preventParentScroll: preventParentScroll,
         isScrollAttribute: isScrollAttribute,
         dataId: dataId,
         shrink: shrink,
@@ -155,13 +157,15 @@ CardContent.propTypes = {
   eleRef: _propTypes["default"].func,
   isScrollAttribute: _propTypes["default"].bool,
   onScroll: _propTypes["default"].func,
-  scroll: _propTypes["default"].oneOf(['horizontal', 'vertical', 'both', 'none']),
+  scroll: _propTypes["default"].PropTypes.oneOf(['vertical', 'horizontal', 'both', 'none']),
   shrink: _propTypes["default"].bool,
-  customClass: _propTypes["default"].string
+  customClass: _propTypes["default"].string,
+  preventParentScroll: _propTypes["default"].PropTypes.oneOf(['vertical', 'horizontal', 'both'])
 };
 CardContent.defaultProps = {
   isScrollAttribute: false,
   scroll: 'vertical',
+  preventParentScroll: 'vertical',
   dataId: 'CardContent',
   customClass: ''
 };
@@ -312,6 +316,7 @@ var Card = /*#__PURE__*/function (_Component3) {
             role: role,
             flexible: true,
             scroll: child.props.scroll,
+            preventParentScroll: child.props.preventParentScroll,
             onScroll: _this4.onScroll,
             eleRef: child.props.eleRef,
             isScrollAttribute: child.props.isScrollAttribute,

package/lib/Card/Card.module.css

@@ -1,20 +1,20 @@
-.notScroll {
-  position: relative;
-}
-.scroll {
-  /* background: var(--dot_white);
-  position: relative; */
-}
-/*
-.scroll::after {
-  box-shadow: 0 0 6px var(--zd_dark10);
-  border-radius: 100px / 10px;
-  content: '';
-  left: var(--zd_size50);
-  position: absolute;
-  right: var(--zd_size50);
-  display: block;
-  z-index: -1;
-  height: var(--zd_size1);
-  bottom: 0;
-} */
+.notScroll {
+  position: relative;
+}
+.scroll {
+  /* background: var(--dot_white);
+  position: relative; */
+}
+/*
+.scroll::after {
+  box-shadow: 0 0 6px var(--zd_dark10);
+  border-radius: 100px / 10px;
+  content: '';
+  left: var(--zd_size50);
+  position: absolute;
+  right: var(--zd_size50);
+  display: block;
+  z-index: -1;
+  height: var(--zd_size1);
+  bottom: 0;
+} */