@spaced-out/ui-design-system 0.1.15 → 0.1.16

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.16](https://github.com/spaced-out/ui-design-system/compare/v0.1.15...v0.1.16) (2023-04-19)
+
+
+### Bug Fixes
+
+* avatar img aspect ratio and Checkbox ref forwarding ([#101](https://github.com/spaced-out/ui-design-system/issues/101)) ([f756a98](https://github.com/spaced-out/ui-design-system/commit/f756a9812a7327c04a99d056b36f479425662153))
+* typography component removed from children wrap ([#104](https://github.com/spaced-out/ui-design-system/issues/104)) ([24887c8](https://github.com/spaced-out/ui-design-system/commit/24887c8a505917738e161ae1208dea533cecfab5))
+
 ### [0.1.15](https://github.com/spaced-out/ui-design-system/compare/v0.1.14...v0.1.15) (2023-04-18)
 
 

package/lib/components/Avatar/Avatar.module.css

@@ -13,16 +13,22 @@
 .container.largeSize {
   width: size60;
   height: size60;
+  min-width: size60;
+  min-height: size60;
 }
 
 .container.mediumSize {
   width: size42;
   height: size42;
+  min-width: size42;
+  min-height: size42;
 }
 
 .container.smallSize {
   width: size34;
   height: size34;
+  min-width: size34;
+  min-height: size34;
 }
 
 .container.baseLargeSize {
@@ -48,8 +54,8 @@
 
 .avatar {
   vertical-align: middle;
-  width: sizeFluid;
-  height: sizeFluid;
+  max-width: sizeFluid;
+  max-height: sizeFluid;
   border-radius: borderRadiusCircle;
   display: flex;
   align-items: center;

package/lib/components/AvatarGroup/AvatarGroup.js

@@ -33,17 +33,27 @@ const AvatarGroup = _ref => {
     large: _space.spaceXSmall
   };
   let colorIndex = -1;
-  const avatarInGroup = (child, index, color) => /*#__PURE__*/React.cloneElement(child, {
-    size,
-    classNames: {
-      wrapper: _AvatarGroupModule.default.avatarInGroup
-    },
-    style: {
-      borderColor,
-      marginLeft: `-${index !== 0 ? leftOverlap[size] : 0}`
-    },
-    color
-  });
+  const avatarInGroup = (child, index, color) => {
+    const {
+      classNames
+    } = child.props;
+    const {
+      wrapper,
+      ...restClassNames
+    } = classNames || {};
+    return /*#__PURE__*/React.cloneElement(child, {
+      size,
+      classNames: {
+        wrapper: (0, _classify.default)(_AvatarGroupModule.default.avatarInGroup, wrapper),
+        ...restClassNames
+      },
+      style: {
+        borderColor,
+        marginLeft: `-${index !== 0 ? leftOverlap[size] : 0}`
+      },
+      color
+    });
+  };
   const childrenArray = React.Children.toArray(children);
   const totalAvatarCount = childrenArray.length;
   const plusAvatar = () => {

package/lib/components/AvatarGroup/AvatarGroup.js.flow

@@ -48,16 +48,22 @@ export const AvatarGroup = ({
 
   let colorIndex = -1;
 
-  const avatarInGroup = (child, index, color) =>
-    React.cloneElement(child, {
+  const avatarInGroup = (child, index, color) => {
+    const {classNames} = child.props;
+    const {wrapper, ...restClassNames} = classNames || {};
+    return React.cloneElement(child, {
       size,
-      classNames: {wrapper: css.avatarInGroup},
+      classNames: {
+        wrapper: classify(css.avatarInGroup, wrapper),
+        ...restClassNames,
+      },
       style: {
         borderColor,
         marginLeft: `-${index !== 0 ? leftOverlap[size] : 0}`,
       },
       color,
     });
+  };
 
   const childrenArray = React.Children.toArray(children);
   const totalAvatarCount = childrenArray.length;

package/lib/components/Checkbox/Checkbox.js

@@ -7,13 +7,12 @@ exports.Checkbox = void 0;
 var React = _interopRequireWildcard(require("react"));
 var _classify = _interopRequireDefault(require("../../utils/classify"));
 var _Icon = require("../Icon");
-var _Text = require("../Text/Text");
 var _CheckboxModule = _interopRequireDefault(require("./Checkbox.module.css"));
 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 Checkbox = _ref => {
+const Checkbox = /*#__PURE__*/React.forwardRef((_ref, forwardRef) => {
   let {
     name = 'checkbox',
     value = '',
@@ -26,9 +25,11 @@ const Checkbox = _ref => {
     onChange,
     align,
     classNames,
-    tabIndex = 0
+    tabIndex = 0,
+    ariaLabel = ''
   } = _ref;
   const checkboxInput = /*#__PURE__*/React.createRef();
+  React.useImperativeHandle(forwardRef, () => checkboxInput.current);
   const handleOnChange = () => {
     if (!disabled) {
       onChange && onChange({
@@ -50,17 +51,21 @@ const Checkbox = _ref => {
       checkboxInput.current.indeterminate = false;
     }
   }, [indeterminate]);
-  return /*#__PURE__*/React.createElement("label", {
+  const onClickHandler = () => {
+    checkboxInput.current?.click();
+  };
+  return /*#__PURE__*/React.createElement("div", {
     "data-testid": "checkbox",
     className: (0, _classify.default)(_CheckboxModule.default.checkboxContainer, {
       [_CheckboxModule.default.disabled]: disabled,
       [_CheckboxModule.default.horizontalCheckbox]: align === 'horizontal-fixed',
       [_CheckboxModule.default.fluidCheckbox]: align === 'horizontal-fluid'
-    }, classNames?.wrapper)
+    }, classNames?.wrapper),
+    onClick: onClickHandler
   }, /*#__PURE__*/React.createElement("span", {
     className: (0, _classify.default)(_CheckboxModule.default.checkboxSquare, {
       [_CheckboxModule.default.disabled]: disabled
-    })
+    }, classNames?.checkboxSquare)
   }, /*#__PURE__*/React.createElement("input", {
     tabIndex: disabled ? -1 : tabIndex,
     type: "checkbox",
@@ -70,7 +75,8 @@ const Checkbox = _ref => {
     onChange: handleOnChange,
     className: (0, _classify.default)(_CheckboxModule.default.inputCheckbox),
     disabled: disabled,
-    name: name
+    name: name,
+    "aria-label": ariaLabel || children
   }), /*#__PURE__*/React.createElement("span", {
     className: (0, _classify.default)(_CheckboxModule.default.checkboxSquareInner, {
       [_CheckboxModule.default.enabled]: !disabled && !error,
@@ -87,9 +93,8 @@ const Checkbox = _ref => {
     name: "check",
     size: "small",
     type: "regular"
-  }))), React.Children.count(children) > 0 && /*#__PURE__*/React.createElement(_Text.FormLabelMedium, {
-    color: "secondary",
+  }))), React.Children.count(children) > 0 && /*#__PURE__*/React.createElement("div", {
     className: (0, _classify.default)(_CheckboxModule.default.checkboxLabel, classNames?.label)
   }, children));
-};
+});
 exports.Checkbox = Checkbox;

package/lib/components/Checkbox/Checkbox.js.flow

@@ -5,12 +5,15 @@ import * as React from 'react';
 import type {GroupAlign} from '../../types/common';
 import classify from '../../utils/classify';
 import {Icon} from '../Icon';
-import {FormLabelMedium} from '../Text/Text';
 
 import css from './Checkbox.module.css';
 
 
-type ClassNames = $ReadOnly<{wrapper?: string, label?: string}>;
+type ClassNames = $ReadOnly<{
+  wrapper?: string,
+  checkboxSquare?: string,
+  label?: string,
+}>;
 
 /*
   Note: An indeterminate state has a higher priority.
@@ -30,111 +33,129 @@ export type CheckboxProps = {
   align?: GroupAlign,
   classNames?: ClassNames,
   tabIndex?: number,
+  ariaLabel?: string,
 };
 
-export const Checkbox = ({
-  name = 'checkbox',
-  value = '',
-  children,
-  checked = false,
-  indeterminate = false,
-  focused = false,
-  disabled = false,
-  error = false,
-  onChange,
-  align,
-  classNames,
-  tabIndex = 0,
-}: CheckboxProps): React.Node => {
-  const checkboxInput = React.createRef<HTMLInputElement>();
+export const Checkbox: React$AbstractComponent<
+  CheckboxProps,
+  HTMLInputElement,
+> = React.forwardRef<CheckboxProps, HTMLInputElement>(
+  (
+    {
+      name = 'checkbox',
+      value = '',
+      children,
+      checked = false,
+      indeterminate = false,
+      focused = false,
+      disabled = false,
+      error = false,
+      onChange,
+      align,
+      classNames,
+      tabIndex = 0,
+      ariaLabel = '',
+    }: CheckboxProps,
+    forwardRef,
+  ): React.Node => {
+    const checkboxInput = React.createRef<HTMLInputElement>();
+    React.useImperativeHandle(forwardRef, () => checkboxInput.current);
 
-  const handleOnChange = () => {
-    if (!disabled) {
-      onChange &&
-        onChange({
-          value,
-          checked: !checked,
-        });
-    }
-  };
+    const handleOnChange = () => {
+      if (!disabled) {
+        onChange &&
+          onChange({
+            value,
+            checked: !checked,
+          });
+      }
+    };
 
-  React.useEffect(() => {
-    if (checkboxInput.current && focused) {
-      checkboxInput.current.focus();
-    }
-  }, [focused]);
+    React.useEffect(() => {
+      if (checkboxInput.current && focused) {
+        checkboxInput.current.focus();
+      }
+    }, [focused]);
 
-  React.useEffect(() => {
-    if (checkboxInput.current && indeterminate) {
-      checkboxInput.current.indeterminate = true;
-    }
-    if (checkboxInput.current && !indeterminate) {
-      checkboxInput.current.indeterminate = false;
-    }
-  }, [indeterminate]);
+    React.useEffect(() => {
+      if (checkboxInput.current && indeterminate) {
+        checkboxInput.current.indeterminate = true;
+      }
+      if (checkboxInput.current && !indeterminate) {
+        checkboxInput.current.indeterminate = false;
+      }
+    }, [indeterminate]);
 
-  return (
-    <label
-      data-testid="checkbox"
-      className={classify(
-        css.checkboxContainer,
-        {
-          [css.disabled]: disabled,
-          [css.horizontalCheckbox]: align === 'horizontal-fixed',
-          [css.fluidCheckbox]: align === 'horizontal-fluid',
-        },
-        classNames?.wrapper,
-      )}
-    >
-      <span
-        className={classify(css.checkboxSquare, {
-          [css.disabled]: disabled,
-        })}
+    const onClickHandler = () => {
+      checkboxInput.current?.click();
+    };
+
+    return (
+      <div
+        data-testid="checkbox"
+        className={classify(
+          css.checkboxContainer,
+          {
+            [css.disabled]: disabled,
+            [css.horizontalCheckbox]: align === 'horizontal-fixed',
+            [css.fluidCheckbox]: align === 'horizontal-fluid',
+          },
+          classNames?.wrapper,
+        )}
+        onClick={onClickHandler}
       >
-        <input
-          tabIndex={disabled ? -1 : tabIndex}
-          type="checkbox"
-          value={value}
-          checked={checked}
-          ref={checkboxInput}
-          onChange={handleOnChange}
-          className={classify(css.inputCheckbox)}
-          disabled={disabled}
-          name={name}
-        />
         <span
-          className={classify(css.checkboxSquareInner, {
-            [css.enabled]: !disabled && !error,
-            [css.disabled]: disabled,
-            [css.error]: error && !disabled,
-          })}
-        >
-          {indeterminate && (
-            <Icon
-              color={disabled ? 'disabled' : 'inversePrimary'}
-              name="hyphen"
-              size="small"
-              type="regular"
-            />
+          className={classify(
+            css.checkboxSquare,
+            {
+              [css.disabled]: disabled,
+            },
+            classNames?.checkboxSquare,
           )}
-          {checked && !indeterminate && (
-            <Icon
-              color={disabled ? 'disabled' : 'inversePrimary'}
-              name="check"
-              size="small"
-              type="regular"
-            />
-          )}
-        </span>
-      </span>
-      {React.Children.count(children) > 0 && (
-        <FormLabelMedium
-          color="secondary"
-          className={classify(css.checkboxLabel, classNames?.label)}
         >
-          {children}
-        </FormLabelMedium>
-      )}
-    </label>
-  );
-};
+          <input
+            tabIndex={disabled ? -1 : tabIndex}
+            type="checkbox"
+            value={value}
+            checked={checked}
+            ref={checkboxInput}
+            onChange={handleOnChange}
+            className={classify(css.inputCheckbox)}
+            disabled={disabled}
+            name={name}
+            aria-label={ariaLabel || children}
+          />
+          <span
+            className={classify(css.checkboxSquareInner, {
+              [css.enabled]: !disabled && !error,
+              [css.disabled]: disabled,
+              [css.error]: error && !disabled,
+            })}
+          >
+            {indeterminate && (
+              <Icon
+                color={disabled ? 'disabled' : 'inversePrimary'}
+                name="hyphen"
+                size="small"
+                type="regular"
+              />
+            )}
+            {checked && !indeterminate && (
+              <Icon
+                color={disabled ? 'disabled' : 'inversePrimary'}
+                name="check"
+                size="small"
+                type="regular"
+              />
+            )}
+          </span>
+        </span>
+        {React.Children.count(children) > 0 && (
+          <div className={classify(css.checkboxLabel, classNames?.label)}>
+            {children}
+          </div>
+        )}
+      </div>
+    );
+  },
+);

package/lib/components/Checkbox/Checkbox.module.css

@@ -58,6 +58,8 @@
 .checkboxSquare {
   width: size24;
   height: size24;
+  min-width: size24;
+  min-height: size24;
   box-sizing: border-box;
   display: flex;
   align-items: center;
@@ -158,5 +160,6 @@ input[type='checkbox']:checked + .error {
 }
 
 .checkboxLabel {
-  composes: truncate from '../../styles/typography.module.css';
+  composes: formLabelMedium from '../../styles/typography.module.css';
+  composes: secondary from '../../styles/typography.module.css';
 }

package/lib/components/Checkbox/CheckboxGroup.js

@@ -12,7 +12,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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 CheckboxGroup = _ref => {
+const CheckboxGroup = /*#__PURE__*/React.forwardRef((_ref, forwardRef) => {
   let {
     align = 'vertical',
     disabled = false,
@@ -72,10 +72,11 @@ const CheckboxGroup = _ref => {
       [_CheckboxGroupModule.default.vertical]: align === 'vertical',
       [_CheckboxGroupModule.default.horizontal]: align === 'horizontal-fixed',
       [_CheckboxGroupModule.default.horizontalFluid]: align === 'horizontal-fluid'
-    }, classNames?.checkboxGroup)
+    }, classNames?.checkboxGroup),
+    ref: forwardRef
   }, childrenWithProps), error && /*#__PURE__*/React.createElement(_Text.BodySmall, {
     className: (0, _classify.default)(classNames?.errorText),
     color: "danger"
   }, errorText));
-};
+});
 exports.CheckboxGroup = CheckboxGroup;

package/lib/components/Checkbox/CheckboxGroup.js.flow

@@ -31,75 +31,86 @@ export type CheckboxGroupProps = {
   children?: React.Node,
 };
 
-export const CheckboxGroup = ({
-  align = 'vertical',
-  disabled = false,
-  name,
-  value: checkedList,
-  onChange,
-  classNames,
-  error = false,
-  errorText = '',
-  children,
-}: CheckboxGroupProps): React.Node => {
-  const onChangeHandler = ({value, checked}) => {
-    const checkedListTemp = checkedList ? [...checkedList] : [];
-    if (checked && !checkedListTemp.includes(value)) {
-      checkedListTemp.push(value);
-    } else if (!checked && checkedListTemp.includes(value)) {
-      for (let i = 0; i < checkedListTemp.length; i++) {
-        if (checkedListTemp[i] === value) {
-          checkedListTemp.splice(i, 1);
-          break;
+export const CheckboxGroup: React$AbstractComponent<
+  CheckboxGroupProps,
+  HTMLDivElement,
+> = React.forwardRef<CheckboxGroupProps, HTMLDivElement>(
+  (
+    {
+      align = 'vertical',
+      disabled = false,
+      name,
+      value: checkedList,
+      onChange,
+      classNames,
+      error = false,
+      errorText = '',
+      children,
+    }: CheckboxGroupProps,
+    forwardRef,
+  ): React.Node => {
+    const onChangeHandler = ({value, checked}) => {
+      const checkedListTemp = checkedList ? [...checkedList] : [];
+      if (checked && !checkedListTemp.includes(value)) {
+        checkedListTemp.push(value);
+      } else if (!checked && checkedListTemp.includes(value)) {
+        for (let i = 0; i < checkedListTemp.length; i++) {
+          if (checkedListTemp[i] === value) {
+            checkedListTemp.splice(i, 1);
+            break;
+          }
         }
       }
-    }
-    onChange && onChange(checkedListTemp);
-  };
+      onChange && onChange(checkedListTemp);
+    };
 
-  const childrenWithProps = React.Children.map(children, (child) => {
-    if (React.isValidElement(child)) {
-      const {
-        value,
-        disabled: disabledChild,
-        error: errorChild,
-        onChange,
-      } = child.props;
-      const childOnChange = (...params) => {
-        onChangeHandler(...params);
-        onChange && onChange(...params);
-      };
-      return React.cloneElement(child, {
-        name,
-        checked: !!checkedList?.includes(value),
-        onChange: childOnChange,
-        align,
-        error: errorChild || error,
-        disabled: disabledChild || disabled,
-      });
-    }
-    return child;
-  });
+    const childrenWithProps = React.Children.map(children, (child) => {
+      if (React.isValidElement(child)) {
+        const {
+          value,
+          disabled: disabledChild,
+          error: errorChild,
+          onChange,
+        } = child.props;
+        const childOnChange = (...params) => {
+          onChangeHandler(...params);
+          onChange && onChange(...params);
+        };
+        return React.cloneElement(child, {
+          name,
+          checked: !!checkedList?.includes(value),
+          onChange: childOnChange,
+          align,
+          error: errorChild || error,
+          disabled: disabledChild || disabled,
+        });
+      }
+      return child;
+    });
 
-  return (
-    <div className={classify(css.checkboxGroupContainer, classNames?.wrapper)}>
+    return (
       <div
-        className={classify(
-          {
-            [css.vertical]: align === 'vertical',
-            [css.horizontal]: align === 'horizontal-fixed',
-            [css.horizontalFluid]: align === 'horizontal-fluid',
-          },
-          classNames?.checkboxGroup,
-        )}
+        className={classify(css.checkboxGroupContainer, classNames?.wrapper)}
       >
-        {childrenWithProps}
+        <div
+          className={classify(
+            {
+              [css.vertical]: align === 'vertical',
+              [css.horizontal]: align === 'horizontal-fixed',
+              [css.horizontalFluid]: align === 'horizontal-fluid',
+            },
+            classNames?.checkboxGroup,
+          )}
+          ref={forwardRef}
+        >
+          {childrenWithProps}
+        </div>
+        {error && (
+          <BodySmall className={classify(classNames?.errorText)} color="danger">
+            {errorText}
+          </BodySmall>
+        )}
       </div>
-      {error && (
-        <BodySmall className={classify(classNames?.errorText)} color="danger">
-          {errorText}
-        </BodySmall>
-      )}
-    </div>
-  );
-};
+    );
+  },
+);