@telus-uds/components-base 1.70.0 → 1.72.0

package/CHANGELOG.md

@@ -1,12 +1,40 @@
 # Change Log - @telus-uds/components-base
 
-This log was last generated on Mon, 27 Nov 2023 21:13:27 GMT and should not be manually modified.
+This log was last generated on Wed, 13 Dec 2023 21:13:56 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.72.0
+
+Wed, 13 Dec 2023 21:13:56 GMT
+
+### Minor changes
+
+- refactor ordered-list for multiplatform (guillermo.peitzner@telus.com)
+- copy over mta type files to components base (evander.owusu@telus.com)
+- new Colourtoggle component (mauricio.batresmontejo@telus.com)
+- Bump @telus-uds/system-theme-tokens to v2.48.0
+
+### Patches
+
+- change to rnmq approach so rnw is not needed as dep for RN (srikanthkhari@gmail.com)
+- adding viewport for consulting tokens (mauricio.batresmontejo@telus.com)
+- fix modal content (mauricio.batresmontejo@telus.com)
+
+## 1.71.0
+
+Fri, 01 Dec 2023 21:08:36 GMT
+
+### Minor changes
+
+- `Card`: Add interactive section (shahzaibkhalidmalik@outlook.com)
+- changes in handleClose method in autocomplete to fix the selection of suggestions in mobile browsers (35577399+JoshHC@users.noreply.github.com)
+- add logic to linkbase to allow items to be center aligned (evander.owusu@telus.com)
+- Bump @telus-uds/system-theme-tokens to v2.47.0
+
 ## 1.70.0
 
-Mon, 27 Nov 2023 21:13:27 GMT
+Mon, 27 Nov 2023 21:20:44 GMT
 
 ### Minor changes
 

package/jest.setup.js

@@ -0,0 +1,7 @@
+import { Dimensions } from 'react-native'
+
+function setWindowWidth(width) {
+  Dimensions.set({ window: { width } })
+}
+
+global.setWindowWidth = setWindowWidth

package/lib/Autocomplete/Autocomplete.js

@@ -273,21 +273,11 @@ const Autocomplete = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) => {
   }, [nestedSelectedValue, items]);
   const handleClose = event => {
     var _openOverlayRef$curre, _openOverlayRef$curre2;
-    if (event.type === 'keydown') {
-      if (event.key === 'Escape' || event.key === 27) {
-        setIsExpanded(false);
-        setNestedSelectedValue(null);
-      } else if (event.key === 'ArrowDown' && isExpanded && !isLoading && targetRef !== null && targetRef !== void 0 && targetRef.current) {
-        targetRef.current.focus();
-      }
-    } else if (event.type === 'click' && openOverlayRef !== null && openOverlayRef !== void 0 && openOverlayRef.current && event.target && !(openOverlayRef !== null && openOverlayRef !== void 0 && (_openOverlayRef$curre = openOverlayRef.current) !== null && _openOverlayRef$curre !== void 0 && _openOverlayRef$curre.contains(event.target))) {
-      setIsExpanded(false);
-    } else if (event.type === 'touchstart' && openOverlayRef !== null && openOverlayRef !== void 0 && openOverlayRef.current && event.touches[0].target && !(openOverlayRef !== null && openOverlayRef !== void 0 && (_openOverlayRef$curre2 = openOverlayRef.current) !== null && _openOverlayRef$curre2 !== void 0 && _openOverlayRef$curre2.contains(event.touches[0].target))) {
-      setIsExpanded(false);
-    } else if (_Platform.default.OS === 'web') {
-      // needed for dropdown to be collapsed when clicking outside on web
+    if (event.type === 'keydown' && (event.key === 'Escape' || event.key === '27') || event.type === 'click' && !(openOverlayRef !== null && openOverlayRef !== void 0 && (_openOverlayRef$curre = openOverlayRef.current) !== null && _openOverlayRef$curre !== void 0 && _openOverlayRef$curre.contains(event.target)) || event.type === 'touchstart' && openOverlayRef !== null && openOverlayRef !== void 0 && openOverlayRef.current && event.touches[0].target && !(openOverlayRef !== null && openOverlayRef !== void 0 && (_openOverlayRef$curre2 = openOverlayRef.current) !== null && _openOverlayRef$curre2 !== void 0 && _openOverlayRef$curre2.contains(event.touches[0].target))) {
       setIsExpanded(false);
       setNestedSelectedValue(null);
+    } else if (event.type === 'keydown' && event.key === 'ArrowDown' && isExpanded && !isLoading && targetRef !== null && targetRef !== void 0 && targetRef.current) {
+      targetRef.current.focus();
     }
   };
   const itemsToShow = currentValue ? itemsToSuggest(highlight(isControlled ? items : currentItems, currentValue, resultsTextColor)) : [];

package/lib/Card/Card.js

@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _View = _interopRequireDefault(require("react-native-web/dist/cjs/exports/View"));
 var _ThemeProvider = require("../ThemeProvider");
 var _utils = require("../utils");
 var _ViewportProvider = require("../ViewportProvider");
 var _props = require("../utils/props");
 var _CardBase = _interopRequireDefault(require("./CardBase"));
+var _PressableCardBase = _interopRequireDefault(require("./PressableCardBase"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -71,26 +73,85 @@ const Card = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     tokens,
     variant,
     dataSet,
+    onPress,
+    interactiveCard,
     ...rest
   } = _ref;
   const viewport = (0, _ViewportProvider.useViewport)();
   const themeTokens = (0, _ThemeProvider.useThemeTokens)('Card', tokens, variant, {
     viewport
   });
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CardBase.default, {
-    ref: ref,
-    tokens: themeTokens,
-    dataSet: dataSet,
-    ...selectProps(rest),
-    children: children
+  const getThemeTokens = (0, _ThemeProvider.useThemeTokensCallback)('Card', interactiveCard === null || interactiveCard === void 0 ? void 0 : interactiveCard.tokens, {
+    interactive: true,
+    ...((interactiveCard === null || interactiveCard === void 0 ? void 0 : interactiveCard.variant) || {})
+  });
+  // When interactive area is present, spacing tokens should only be applied
+  // to individual Card sections, not Card as a whole
+  const {
+    paddingTop,
+    paddingBottom,
+    paddingLeft,
+    paddingRight,
+    ...restOfTokens
+  } = themeTokens;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CardBase.default, {
+      ref: ref,
+      tokens: interactiveCard !== null && interactiveCard !== void 0 && interactiveCard.body ? restOfTokens : themeTokens,
+      dataSet: dataSet,
+      ...selectProps(rest),
+      children: interactiveCard !== null && interactiveCard !== void 0 && interactiveCard.body ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_PressableCardBase.default, {
+          ref: ref,
+          tokens: getThemeTokens,
+          dataSet: dataSet,
+          onPress: onPress,
+          ...selectProps(rest),
+          children: interactiveCard === null || interactiveCard === void 0 ? void 0 : interactiveCard.body
+        }), children ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
+          style: {
+            paddingTop,
+            paddingBottom,
+            paddingLeft,
+            paddingRight
+          },
+          children: children
+        }) : null]
+      }) : children
+    })
   });
 });
 Card.displayName = 'Card';
 Card.propTypes = {
   ...selectedSystemPropTypes,
+  /**
+   * Card content.
+   */
   children: _propTypes.default.node,
+  /**
+   * Card tokens.
+   */
   tokens: (0, _utils.getTokensPropType)('Card'),
-  variant: _utils.variantProp.propType
+  /**
+   * Card variant.
+   */
+  variant: _utils.variantProp.propType,
+  /**
+   * Function to call on pressing the card.
+   * Note: This is only available when `interactiveCard` prop is used.
+   */
+  onPress: _propTypes.default.func,
+  /**
+   * Object to set interactive card's properties
+   * - body: The body of the interactive card, can be any renderable node
+   * - tokens: The tokens to be used for the interactive card
+   * - variant: The variant to be used for the interactive card
+   */
+  interactiveCard: _propTypes.default.shape({
+    body: _propTypes.default.node,
+    tokens: (0, _utils.getTokensPropType)('Card'),
+    variant: _utils.variantProp.propType
+  })
 };
 var _default = Card;
 exports.default = _default;

package/lib/Card/PressableCardBase.js

@@ -38,6 +38,7 @@ const PressableCardBase = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     inactive,
     href,
     hrefAttrs,
+    dataSet,
     accessibilityRole = href ? 'link' : undefined,
     ...rawRest
   } = _ref;
@@ -97,6 +98,7 @@ const PressableCardBase = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     onKeyDown: handleKeyDown,
     hrefAttrs: hrefAttrs,
     style: getOuterBorderStyle,
+    dataSet: dataSet,
     ...selectProps({
       ...rest,
       accessibilityRole

package/lib/ColourToggle/ColourBubble.js

@@ -0,0 +1,135 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _View = _interopRequireDefault(require("react-native-web/dist/cjs/exports/View"));
+var _Pressable = _interopRequireDefault(require("react-native-web/dist/cjs/exports/Pressable"));
+var _Platform = _interopRequireDefault(require("react-native-web/dist/cjs/exports/Platform"));
+var _pressability = require("../utils/pressability");
+var _ThemeProvider = require("../ThemeProvider");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const selectGeneralBubbleTokens = _ref => {
+  let {
+    outerBubbleHeight,
+    outerBubbleWidth,
+    outerBubbleContentAlignItems,
+    outerBubbleJustifyContent,
+    bubbleBorderColor,
+    bubbleBorderWidth,
+    bubbleBorderRadius
+  } = _ref;
+  return {
+    height: outerBubbleHeight,
+    width: outerBubbleWidth,
+    justifyContent: outerBubbleContentAlignItems,
+    alignItems: outerBubbleJustifyContent,
+    borderColor: bubbleBorderColor,
+    borderWidth: bubbleBorderWidth,
+    borderRadius: bubbleBorderRadius,
+    ..._Platform.default.select({
+      web: {
+        outline: 'none'
+      }
+    })
+  };
+};
+const selectInnerBubbleTokens = _ref2 => {
+  let {
+    innerBubbleHeight,
+    innerBubbleWidth,
+    innerBubbleBorderRadius,
+    borderColor,
+    borderWidth,
+    shadow
+  } = _ref2;
+  return {
+    height: innerBubbleHeight,
+    width: innerBubbleWidth,
+    borderRadius: innerBubbleBorderRadius,
+    borderColor,
+    borderWidth,
+    ...(0, _ThemeProvider.applyShadowToken)(shadow)
+  };
+};
+const selectBorderBubbleTokens = _ref3 => {
+  let {
+    bubbleBorderColor,
+    bubbleBorderWidth,
+    bubbleBorderRadius
+  } = _ref3;
+  return {
+    borderColor: bubbleBorderColor,
+    borderWidth: bubbleBorderWidth,
+    borderRadius: bubbleBorderRadius
+  };
+};
+const ColourBubble = /*#__PURE__*/(0, _react.forwardRef)((_ref4, ref) => {
+  let {
+    tokens = {},
+    id,
+    colourHexCode,
+    colourName,
+    isSelected,
+    onPress
+  } = _ref4;
+  const defaultTokens = tokens({
+    selected: isSelected
+  });
+  const resolveColourBubbleTokens = pressState => (0, _pressability.resolvePressableTokens)(tokens, pressState, {});
+  const themeTokens = (0, _react.useMemo)(() => tokens(), [tokens]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Pressable.default, {
+    style: state => [selectGeneralBubbleTokens(resolveColourBubbleTokens(state)), isSelected && selectBorderBubbleTokens(defaultTokens)],
+    onPress: onPress,
+    accessible: true,
+    accessibilityRole: "radio",
+    accessibilityLabel: colourName,
+    accessibilityState: {
+      checked: isSelected
+    },
+    ref: ref,
+    testID: id,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
+      style: [selectInnerBubbleTokens(themeTokens), {
+        backgroundColor: colourHexCode
+      }]
+    })
+  });
+});
+ColourBubble.displayName = 'ColourBubble';
+ColourBubble.propTypes = {
+  /**
+   * Colour toggle tokens callback.
+   */
+  tokens: _propTypes.default.func,
+  /**
+   * ID of each colour bubble
+   */
+  id: _propTypes.default.string,
+  /**
+   * Hexadecimal code for the background of the colour bubble
+   */
+  colourHexCode: _propTypes.default.string,
+  /**
+   * Name of the colour bubble
+   */
+  colourName: _propTypes.default.string,
+  /**
+   * If the current colour bubble is selected
+   */
+  isSelected: _propTypes.default.bool,
+  /**
+   * If provided, this function is called when the current selection
+   * of the color is changed of all currently `items`.
+   * Receives two parameters: item object selected and the event
+   */
+  onPress: _propTypes.default.func
+};
+var _default = ColourBubble;
+exports.default = _default;

package/lib/ColourToggle/ColourToggle.js

@@ -0,0 +1,101 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _View = _interopRequireDefault(require("react-native-web/dist/cjs/exports/View"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _ThemeProvider = require("../ThemeProvider");
+var _utils = require("../utils");
+var _StackView = require("../StackView");
+var _Typography = _interopRequireDefault(require("../Typography"));
+var _ColourBubble = _interopRequireDefault(require("./ColourBubble"));
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const [selectProps, selectedSystemPropTypes] = (0, _utils.selectSystemProps)([_utils.a11yProps, _utils.viewProps]);
+const ColourToggle = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
+  let {
+    tokens,
+    variant,
+    defaultColourId,
+    items,
+    onChange,
+    ...rest
+  } = _ref;
+  const [currentColourId, setCurrentColourId] = (0, _react.useState)(defaultColourId);
+  const getTokens = (0, _ThemeProvider.useThemeTokensCallback)('ColourToggle', tokens, variant);
+  const {
+    space
+  } = getTokens();
+  const {
+    colourName: currentColourName = ''
+  } = items.find(item => item.id === currentColourId) || '';
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_View.default, {
+    ref: ref,
+    ...selectProps(rest),
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
+      children: currentColourName
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_StackView.StackWrap, {
+      space: space,
+      accessibilityRole: "radiogroup",
+      children: items.map((_ref2, index) => {
+        let {
+          id,
+          colourHexCode,
+          colourName
+        } = _ref2;
+        const colourBubbleId = id || `ColourBubble[${index}]`;
+        const handleChangeColour = event => {
+          setCurrentColourId(id);
+          onChange === null || onChange === void 0 ? void 0 : onChange(event, {
+            id,
+            colourHexCode,
+            colourName
+          });
+        };
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ColourBubble.default, {
+          id: colourBubbleId,
+          tokens: getTokens,
+          isSelected: id === currentColourId,
+          colourHexCode: colourHexCode,
+          colourName: colourName,
+          onPress: handleChangeColour
+        }, colourBubbleId);
+      })
+    })]
+  });
+});
+ColourToggle.displayName = 'ColourToggle';
+ColourToggle.propTypes = {
+  ...selectedSystemPropTypes,
+  /**
+   * Optional theme token overrides for the outer ColourToggle component
+   */
+  tokens: (0, _utils.getTokensPropType)('ColourToggle'),
+  /**
+   * Colour toggle variant.
+   */
+  variant: _utils.variantProp.propType,
+  /**
+   * Id of the selected color when component mounts
+   */
+  defaultColourId: _propTypes.default.string,
+  /**
+   * Array of objects containing specifics for each ColourBubble to be rendered in the group.
+   */
+  items: _propTypes.default.arrayOf(_propTypes.default.exact({
+    colourHexCode: _propTypes.default.string,
+    colourName: _propTypes.default.string,
+    id: _propTypes.default.string
+  })),
+  /**
+   * If provided, this function is called when the current selection of the color is changed of all currently `items`. Receives two parameters: item object selected and the event
+   */
+  onChange: _propTypes.default.func
+};
+var _default = ColourToggle;
+exports.default = _default;

package/lib/ColourToggle/index.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _ColourToggle = _interopRequireDefault(require("./ColourToggle"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _default = _ColourToggle.default;
+exports.default = _default;

package/lib/FlexGrid/Col/Col.js

@@ -7,10 +7,7 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Platform = _interopRequireDefault(require("react-native-web/dist/cjs/exports/Platform"));
-var _StyleSheet = _interopRequireDefault(require("react-native-web/dist/cjs/exports/StyleSheet"));
-var _systemConstants = require("@telus-uds/system-constants");
 var _GutterContext = _interopRequireDefault(require("../providers/GutterContext"));
-var _ViewportProvider = require("../../ViewportProvider");
 var _helpers = _interopRequireDefault(require("../helpers"));
 var _utils = require("../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -35,7 +32,6 @@ const Col = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     ...viewProps
   } = _ref;
   const gutter = (0, _react.useContext)(_GutterContext.default);
-  const viewPort = (0, _ViewportProvider.useViewport)();
   const hiddenLevels = (0, _helpers.default)([xs, sm, md, lg, xl]);
   const getHorizontalAlignLevel = () => {
     if (typeof horizontalAlign === 'object') {
@@ -76,60 +72,11 @@ const Col = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     }
     return {};
   };
-  const sizeStyles = sizes => {
-    const currViewport = Object.keys(sizes).find(key => key.startsWith(viewPort));
-    const currSize = sizes[currViewport];
-    return {
-      ...calculateWidth(currSize)
-    };
-  };
-  const offsetStyles = offsets => {
-    const currViewport = Object.keys(offsets).find(key => key.startsWith(viewPort));
-    const currOffset = offsets[currViewport];
-    return {
-      ...calculateOffset(currOffset)
-    };
-  };
-  const gutterPadding = {
-    paddingLeft: gutter ? 16 : 0,
-    paddingRight: gutter ? 16 : 0
-  };
-  let hidingStyles = {};
 
   // TODO: consider setting this to always 'flex' in a major release.
   // `display: block` is invalid in native apps.
   // See https://telusdigital.atlassian.net/browse/UDS1-92
   const shown = !flex && _Platform.default.OS === 'web' ? 'block' : 'flex';
-  if (viewPort === _systemConstants.viewports.xs) {
-    hidingStyles = {
-      display: hiddenLevels[0] === 0 ? 'none' : shown,
-      textAlign: horizontalAlignLevel[0]
-    };
-  }
-  if (viewPort === _systemConstants.viewports.sm) {
-    hidingStyles = {
-      display: hiddenLevels[1] === 0 ? 'none' : shown,
-      textAlign: horizontalAlignLevel[1]
-    };
-  }
-  if (viewPort === _systemConstants.viewports.md) {
-    hidingStyles = {
-      display: hiddenLevels[2] === 0 ? 'none' : shown,
-      textAlign: horizontalAlignLevel[2]
-    };
-  }
-  if (viewPort === _systemConstants.viewports.lg) {
-    hidingStyles = {
-      display: hiddenLevels[3] === 0 ? 'none' : shown,
-      textAlign: horizontalAlignLevel[3]
-    };
-  }
-  if (viewPort === _systemConstants.viewports.xl) {
-    hidingStyles = {
-      display: hiddenLevels[4] === 0 ? 'none' : shown,
-      textAlign: horizontalAlignLevel[4]
-    };
-  }
   const sizesArray = [xs, sm, md, lg, xl];
   const offSetsArray = [xsOffset, smOffset, mdOffset, lgOffset, xlOffset];
   const sizesWithIheritance = (0, _helpers.default)(sizesArray);
@@ -148,24 +95,63 @@ const Col = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     lg: offsetsWithIheritance[3],
     xl: offsetsWithIheritance[4]
   };
+  const mediaQueryStyles = (0, _utils.createMediaQueryStyles)({
+    xs: {
+      display: hiddenLevels[0] === 0 ? 'none' : shown,
+      textAlign: horizontalAlignLevel[0],
+      ...calculateWidth(sizes.xs),
+      ...calculateOffset(offsets.xs)
+    },
+    sm: {
+      display: hiddenLevels[1] === 0 ? 'none' : shown,
+      textAlign: horizontalAlignLevel[1],
+      ...calculateWidth(sizes.sm),
+      ...calculateOffset(offsets.sm)
+    },
+    md: {
+      display: hiddenLevels[2] === 0 ? 'none' : shown,
+      textAlign: horizontalAlignLevel[2],
+      ...calculateWidth(sizes.md),
+      ...calculateOffset(offsets.md)
+    },
+    lg: {
+      display: hiddenLevels[3] === 0 ? 'none' : shown,
+      textAlign: horizontalAlignLevel[3],
+      ...calculateWidth(sizes.lg),
+      ...calculateOffset(offsets.lg)
+    },
+    xl: {
+      display: hiddenLevels[4] === 0 ? 'none' : shown,
+      textAlign: horizontalAlignLevel[4],
+      ...calculateWidth(sizes.xl),
+      ...calculateOffset(offsets.xl)
+    }
+  });
+  const {
+    ids,
+    styles
+  } = _utils.StyleSheet.create({
+    col: {
+      flexGrow: 1,
+      flexShrink: 0,
+      flexBasis: 'auto',
+      maxWidth: '100%',
+      paddingLeft: gutter ? 16 : 0,
+      paddingRight: gutter ? 16 : 0,
+      ...mediaQueryStyles
+    }
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.BaseView, {
     ref: ref,
     ...viewProps,
-    style: [styles.col, gutterPadding, offsetStyles(offsets), sizeStyles(sizes), {
-      ...hidingStyles
-    }],
+    style: [styles.col],
+    dataSet: {
+      media: ids.col
+    },
     children: children
   });
 });
 Col.displayName = 'Col';
-const styles = _StyleSheet.default.create({
-  col: {
-    flexGrow: 1,
-    flexShrink: 0,
-    flexBasis: 'auto',
-    maxWidth: '100%'
-  }
-});
 
 /*
  * We're disabling default props since passing undefined props to