@invoicebox/ui 0.1.0-alpha.304 → 0.1.0-alpha.306

package/dist/esm/components/form/SearchInput/styles.js

@@ -3,8 +3,8 @@ export var IconWrapper = styled.span.withConfig({
   displayName: "styles__IconWrapper",
   componentId: "sc-1cx3n6g-0"
 })(["position:absolute;right:20px;bottom:", ";transform:translateY(50%);display:flex;align-content:center;justify-content:center;opacity:", ";transition:all 0.2s ease-in-out 0s;color:", ";"], function (_ref) {
-  var $wideBottomSpacing = _ref.$wideBottomSpacing;
-  return $wideBottomSpacing ? "calc(50% - 5px)" : '50%';
+  var $useModernStyles = _ref.$useModernStyles;
+  return !$useModernStyles ? "calc(50% - 5px)" : '50%';
 }, function (_ref2) {
   var $inFocus = _ref2.$inFocus;
   return $inFocus ? 1 : 0.5;

package/dist/esm/components/form/Select/components/Input/index.js

@@ -1,15 +1,15 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-import React, { forwardRef, useMemo } from 'react';
+import React, { forwardRef } from 'react';
 import * as S from './styles';
 import { InputLabel } from '../../../InputLabel';
 import { PureInput } from '../../../PureInput';
 import { Arrow } from '../../../../common/Arrow';
 import { ResetButton } from '../../../ResetButton';
-import { MODERN_STYLE_SIZE_PARAMS_MAP, SIZE_PARAMS_MAP } from '../../../constants';
-import { ModernPlaceholder } from '../../../ModernPlaceholder';
+import { useInputStyles } from '../../../_hooks/useInputStyles';
 export var Input = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var hasError = _ref.hasError,
-    inFocus = _ref.inFocus,
+    _ref$inFocus = _ref.inFocus,
+    inFocus = _ref$inFocus === void 0 ? false : _ref$inFocus,
     placeholder = _ref.placeholder,
     onFocus = _ref.onFocus,
     onBlur = _ref.onBlur,
@@ -25,43 +25,26 @@ export var Input = /*#__PURE__*/forwardRef(function (_ref, ref) {
     required = _ref.required,
     _ref$useModernStyles = _ref.useModernStyles,
     useModernStyles = _ref$useModernStyles === void 0 ? false : _ref$useModernStyles;
-  var inputLabel = useMemo(function () {
-    if (useModernStyles) {
-      if (value || inFocus) {
-        return label;
-      } else {
-        return undefined;
-      }
-    } else {
-      return label;
-    }
-  }, [inFocus, label, value, useModernStyles]);
+  var _useInputStyles = useInputStyles({
+      isHaveValue: !!value,
+      useModernStyles: useModernStyles,
+      size: size,
+      label: label,
+      inFocus: inFocus,
+      placeholder: placeholder,
+      required: required
+    }),
+    inputLabel = _useInputStyles.inputLabel,
+    paddingAndVariantOptions = _useInputStyles.paddingAndVariantOptions,
+    modernPlaceholder = _useInputStyles.modernPlaceholder;
   var isShowResetIcon = !!value && !!onReset;
-  var isModernPlaceholderVisible = useMemo(function () {
-    return useModernStyles && !isOpen && !value;
-  }, [isOpen, useModernStyles, value]);
-  var modernInputPlaceholder = useMemo(function () {
-    return placeholder || label;
-  }, [label, placeholder]);
-  var paddingOptions = useMemo(function () {
-    if ((value || isOpen) && useModernStyles && label) {
-      return MODERN_STYLE_SIZE_PARAMS_MAP[size];
-    } else {
-      return SIZE_PARAMS_MAP[size];
-    }
-  }, [value, isOpen, useModernStyles, size, label]);
   return /*#__PURE__*/React.createElement(InputLabel, {
     inFocus: inFocus,
     label: inputLabel,
     required: required,
     useModernStyles: useModernStyles,
     size: size
-  }, /*#__PURE__*/React.createElement(S.ControlWrapper, null, useModernStyles && modernInputPlaceholder && /*#__PURE__*/React.createElement(ModernPlaceholder, {
-    visible: isModernPlaceholderVisible,
-    paddingTop: SIZE_PARAMS_MAP[size !== null && size !== void 0 ? size : 'M'].paddingTop,
-    size: size !== null && size !== void 0 ? size : 'M',
-    required: required
-  }, modernInputPlaceholder), /*#__PURE__*/React.createElement(PureInput, _extends({
+  }, /*#__PURE__*/React.createElement(S.ControlWrapper, null, modernPlaceholder, /*#__PURE__*/React.createElement(PureInput, _extends({
     ref: ref,
     hasError: hasError,
     inFocus: inFocus,
@@ -75,7 +58,7 @@ export var Input = /*#__PURE__*/forwardRef(function (_ref, ref) {
     paddingRight: 52,
     onClick: onClick,
     useModernStyles: useModernStyles
-  }, paddingOptions)), /*#__PURE__*/React.createElement(S.IconWrapper, {
+  }, paddingAndVariantOptions)), /*#__PURE__*/React.createElement(S.IconWrapper, {
     $pointerEvents: isShowResetIcon ? 'default' : 'none'
   }, isShowResetIcon ? /*#__PURE__*/React.createElement(ResetButton, {
     onClick: onReset

package/dist/esm/components/form/TextInput/index.js

@@ -1,11 +1,10 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback } from 'react';
 import * as S from './styles';
 import { InputLabel } from '../InputLabel';
 import { PureInput } from '../PureInput';
 import { useInputFocus } from '../../../hooks/useInputFocus';
-import { MODERN_STYLE_SIZE_PARAMS_MAP, SIZE_PARAMS_MAP } from '../constants';
-import { ModernPlaceholder } from '../ModernPlaceholder';
+import { useInputStyles } from '../_hooks/useInputStyles';
 export var TextInput = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$hasError = _ref.hasError,
     hasError = _ref$hasError === void 0 ? false : _ref$hasError,
@@ -43,33 +42,21 @@ export var TextInput = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     inFocus = _useInputFocus.inFocus,
     handleFocus = _useInputFocus.handleFocus,
     handleBlur = _useInputFocus.handleBlur;
+  var _useInputStyles = useInputStyles({
+      isHaveValue: !!value,
+      useModernStyles: useModernStyles,
+      size: size,
+      label: label,
+      inFocus: inFocus,
+      placeholder: placeholder,
+      required: required
+    }),
+    inputLabel = _useInputStyles.inputLabel,
+    paddingAndVariantOptions = _useInputStyles.paddingAndVariantOptions,
+    modernPlaceholder = _useInputStyles.modernPlaceholder;
   var handleChange = useCallback(function (event) {
     onChange(event.target.value.slice(0, maxLength !== null && maxLength !== void 0 ? maxLength : Infinity));
   }, [onChange, maxLength]);
-  var inputLabel = useMemo(function () {
-    if (useModernStyles) {
-      if (value || inFocus) {
-        return label;
-      } else {
-        return undefined;
-      }
-    } else {
-      return label;
-    }
-  }, [inFocus, label, value, useModernStyles]);
-  var paddingOptions = useMemo(function () {
-    if ((value || inFocus) && useModernStyles && inputLabel) {
-      return MODERN_STYLE_SIZE_PARAMS_MAP[size];
-    } else {
-      return SIZE_PARAMS_MAP[size];
-    }
-  }, [value, inFocus, useModernStyles, size, inputLabel]);
-  var modernInputPlaceholder = useMemo(function () {
-    return placeholder || label;
-  }, [label, placeholder]);
-  var isModernPlaceholderVisible = useMemo(function () {
-    return !inFocus && !value;
-  }, [inFocus, value]);
   return /*#__PURE__*/React.createElement(InputLabel, {
     inFocus: inFocus,
     label: inputLabel,
@@ -77,12 +64,7 @@ export var TextInput = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     required: required,
     size: size,
     useModernStyles: useModernStyles
-  }, /*#__PURE__*/React.createElement(S.InputLabelContent, null, useModernStyles && modernInputPlaceholder && /*#__PURE__*/React.createElement(ModernPlaceholder, {
-    visible: isModernPlaceholderVisible,
-    paddingTop: SIZE_PARAMS_MAP[size].paddingTop,
-    size: size,
-    required: required
-  }, modernInputPlaceholder), /*#__PURE__*/React.createElement(PureInput, _extends({
+  }, /*#__PURE__*/React.createElement(S.InputLabelContent, null, modernPlaceholder, /*#__PURE__*/React.createElement(PureInput, _extends({
     id: id,
     ref: ref,
     name: name,
@@ -104,6 +86,6 @@ export var TextInput = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     inputMode: inputMode,
     readOnly: readOnly,
     autoComplete: autoComplete
-  }, paddingOptions)), children && /*#__PURE__*/React.createElement(S.ChildrenWrapper, null, children)));
+  }, paddingAndVariantOptions)), children && /*#__PURE__*/React.createElement(S.ChildrenWrapper, null, children)));
 });
 TextInput.displayName = 'TextInput';

package/dist/esm/components/form/_hooks/useInputStyles.js

@@ -0,0 +1,58 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { MODERN_STYLE_SIZE_PARAMS_MAP, SIZE_PARAMS_MAP } from '../constants';
+import React, { useMemo } from 'react';
+import { ModernPlaceholder } from '../ModernPlaceholder';
+export var useInputStyles = function useInputStyles(_ref) {
+  var inFocus = _ref.inFocus,
+    useModernStyles = _ref.useModernStyles,
+    label = _ref.label,
+    size = _ref.size,
+    placeholder = _ref.placeholder,
+    isHaveValue = _ref.isHaveValue,
+    required = _ref.required,
+    _ref$conditionHideMod = _ref.conditionHideModernPlaceholder,
+    conditionHideModernPlaceholder = _ref$conditionHideMod === void 0 ? false : _ref$conditionHideMod;
+  var isHideModernPlaceholder = isHaveValue || inFocus || conditionHideModernPlaceholder;
+  var inputLabel = useMemo(function () {
+    if (useModernStyles) {
+      return isHideModernPlaceholder ? label : undefined;
+    } else {
+      return label;
+    }
+  }, [useModernStyles, isHideModernPlaceholder, label]);
+  var paddingAndVariantOptions = useMemo(function () {
+    if (useModernStyles) {
+      if (isHideModernPlaceholder) {
+        return MODERN_STYLE_SIZE_PARAMS_MAP[size];
+      } else {
+        return _objectSpread(_objectSpread({}, MODERN_STYLE_SIZE_PARAMS_MAP[size]), {}, {
+          paddingTop: MODERN_STYLE_SIZE_PARAMS_MAP[size].$placeholderPaddingTop,
+          paddingBottom: MODERN_STYLE_SIZE_PARAMS_MAP[size].$placeholderPaddingTop
+        });
+      }
+    } else {
+      return SIZE_PARAMS_MAP[size];
+    }
+  }, [useModernStyles, isHideModernPlaceholder, size]);
+  var modernInputPlaceholder = useMemo(function () {
+    return placeholder || label;
+  }, [label, placeholder]);
+  var modernPlaceholder = useModernStyles && modernInputPlaceholder && /*#__PURE__*/React.createElement(ModernPlaceholder, {
+    visible: !isHideModernPlaceholder,
+    paddingTop: MODERN_STYLE_SIZE_PARAMS_MAP[size].$placeholderPaddingTop,
+    size: size,
+    required: required
+  }, modernInputPlaceholder);
+  return {
+    inputLabel: inputLabel,
+    paddingAndVariantOptions: paddingAndVariantOptions,
+    modernInputPlaceholder: modernInputPlaceholder,
+    isHideModernPlaceholder: isHideModernPlaceholder,
+    modernPlaceholder: modernPlaceholder
+  };
+};

package/dist/esm/components/form/constants.js

@@ -17,24 +17,27 @@ export var SIZE_PARAMS_MAP = {
 };
 export var MODERN_STYLE_SIZE_PARAMS_MAP = {
   L: {
-    paddingTop: 20,
-    paddingBottom: 12,
-    variant: 'bodyMRegular',
-    $labelVariant: 'captionRegular',
-    $labelPaddingTop: 14
+    paddingTop: 24,
+    paddingBottom: 8,
+    variant: 'headline5',
+    $labelVariant: 'labelsHintsRegular',
+    $labelPaddingTop: 8,
+    $placeholderPaddingTop: 16
   },
   M: {
     paddingTop: 20,
-    paddingBottom: 6,
-    variant: 'bodyMRegular',
-    $labelVariant: 'captionRegular',
-    $labelPaddingTop: 12
+    paddingBottom: 4,
+    variant: 'bodyL',
+    $labelVariant: 'labelsHintsRegular',
+    $labelPaddingTop: 4,
+    $placeholderPaddingTop: 12
   },
   XS: {
-    paddingTop: 16,
-    paddingBottom: 4,
-    variant: 'labelsHintsRegular',
-    $labelVariant: 'captionSRegular',
-    $labelPaddingTop: 12
+    paddingTop: 6,
+    paddingBottom: 6,
+    variant: 'headline5',
+    $labelVariant: 'labelsHintsRegular',
+    $labelPaddingTop: -18,
+    $placeholderPaddingTop: 6
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@invoicebox/ui",
-    "version": "0.1.0-alpha.304",
+    "version": "0.1.0-alpha.306",
     "description": "Invoicebox UI",
     "license": "Apache License 2.0",
     "scripts": {