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

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

@@ -5,7 +5,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-import React, { useCallback, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useRef, useState } from 'react';
 import { useComponentPalette } from '../../../palette';
 import { useOutsideClick } from '../../../hooks/useOutsideClick';
 import { useInputFocus } from '../../../hooks/useInputFocus';
@@ -13,8 +13,6 @@ import { logic } from '../DateInput/logic';
 import * as S from './styles';
 import { InputLabel } from '../InputLabel';
 import { PureInput } from '../PureInput';
-import { MODERN_STYLE_SIZE_PARAMS_MAP, SIZE_PARAMS_MAP } from '../constants';
-import { ModernPlaceholder } from '../ModernPlaceholder';
 import { CalendarIcon } from '../DateInput/components/CalendarIcon';
 import { Dropdown } from '../../common/Dropdown';
 import { Calendar } from '../../common/Calendar';
@@ -23,6 +21,7 @@ import { Typography, useMobile } from '../../../index';
 import { useTimePickerHeight } from './hooks/useTimePickerHeight';
 import { useStringValue } from './hooks/useStringValue';
 import { MobileDrawerDateTimeCalendar } from './components/MobileDrawerDateTimeCalendar';
+import { useInputStyles } from '../_hooks/useInputStyles';
 export var DateTimeInput = function DateTimeInput(_ref) {
   var onChange = _ref.onChange,
     value = _ref.value,
@@ -82,6 +81,18 @@ export var DateTimeInput = function DateTimeInput(_ref) {
     inFocus = _useInputFocus.inFocus,
     focusHandler = _useInputFocus.handleFocus,
     blurHandler = _useInputFocus.handleBlur;
+  var _useInputStyles = useInputStyles({
+      isHaveValue: !!stringValue,
+      useModernStyles: useModernStyles,
+      size: size,
+      label: label,
+      inFocus: inFocus,
+      placeholder: placeholder,
+      conditionHideModernPlaceholder: isOpen
+    }),
+    inputLabel = _useInputStyles.inputLabel,
+    paddingAndVariantOptions = _useInputStyles.paddingAndVariantOptions,
+    modernPlaceholder = _useInputStyles.modernPlaceholder;
   var handleStringValueChange = useCallback(function (event) {
     setStringValue(event.target.value);
   }, [setStringValue]);
@@ -122,35 +133,6 @@ export var DateTimeInput = function DateTimeInput(_ref) {
   }, [calendarDropdownValue, handleClose, maxDate, minDate, onChange, setStringValue, value, withTime]);
   var maxTime = calendarDropdownValue && maxDate && calendarDropdownValue.getFullYear() === maxDate.getFullYear() && calendarDropdownValue.getMonth() === maxDate.getMonth() && calendarDropdownValue.getDate() === maxDate.getDate() ? [maxDate.getHours(), maxDate.getMinutes()] : undefined;
   var minTime = calendarDropdownValue && minDate && calendarDropdownValue.getFullYear() === minDate.getFullYear() && calendarDropdownValue.getMonth() === minDate.getMonth() && calendarDropdownValue.getDate() === minDate.getDate() ? [minDate.getHours(), minDate.getMinutes()] : undefined;
-  var inputLabel = useMemo(function () {
-    if (useModernStyles) {
-      if (stringValue || isOpen) {
-        return label;
-      } else {
-        return undefined;
-      }
-    } else {
-      return label;
-    }
-  }, [isOpen, label, stringValue, useModernStyles]);
-  var paddingOptions = useMemo(function () {
-    if ((stringValue || isOpen) && useModernStyles && inputLabel) {
-      return MODERN_STYLE_SIZE_PARAMS_MAP[size];
-    } else {
-      return SIZE_PARAMS_MAP[size];
-    }
-  }, [stringValue, isOpen, useModernStyles, size, inputLabel]);
-  var inputPlaceholder = useMemo(function () {
-    if (useModernStyles) {
-      return undefined;
-    } else {
-      return placeholder || logic.getPlaceholder(withTime);
-    }
-  }, [placeholder, useModernStyles, withTime]);
-  var modernPlaceholderText = placeholder || label || logic.getPlaceholder(withTime);
-  var isModernPlaceholderVisible = useMemo(function () {
-    return !isOpen && !stringValue;
-  }, [isOpen, stringValue]);
   return /*#__PURE__*/React.createElement(S.Wrapper, {
     ref: isMobile ? undefined : elRef
   }, /*#__PURE__*/React.createElement(InputLabel, {
@@ -159,25 +141,20 @@ export var DateTimeInput = function DateTimeInput(_ref) {
     required: required,
     useModernStyles: useModernStyles,
     size: size
-  }, /*#__PURE__*/React.createElement(S.InputWrapper, null, useModernStyles && /*#__PURE__*/React.createElement(ModernPlaceholder, {
-    visible: isModernPlaceholderVisible,
-    paddingTop: SIZE_PARAMS_MAP[size].paddingTop,
-    size: size,
-    required: required
-  }, modernPlaceholderText), /*#__PURE__*/React.createElement(PureInput, _extends({
+  }, /*#__PURE__*/React.createElement(S.InputWrapper, null, modernPlaceholder, /*#__PURE__*/React.createElement(PureInput, _extends({
     onClick: handleTrigger,
     ref: inputRef,
     hasError: hasError,
     inFocus: inFocus,
     name: name,
-    placeholder: inputPlaceholder,
+    placeholder: useModernStyles ? undefined : placeholder || logic.getPlaceholder(withTime),
     onFocus: focusHandler,
     onBlur: handleBlur,
     value: stringValue,
     onChange: handleStringValueChange,
     paddingRight: 44,
     useModernStyles: useModernStyles
-  }, paddingOptions)), /*#__PURE__*/React.createElement(S.Icon, {
+  }, paddingAndVariantOptions)), /*#__PURE__*/React.createElement(S.Icon, {
     onClick: handleTrigger,
     $color: palette.icon
   }, /*#__PURE__*/React.createElement(CalendarIcon, null)))), !isMobile ? /*#__PURE__*/React.createElement(Dropdown, _extends({

package/dist/esm/components/form/DateTimeInput/index.stories.js

@@ -44,7 +44,8 @@ var COMMON_ARGS = {
   hasError: false,
   label: 'Label',
   minDate: new Date(),
-  maxDate: dateAfter29Days
+  maxDate: dateAfter29Days,
+  useModernStyles: true
 };
 export var Default = {
   args: COMMON_ARGS,

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

@@ -13,21 +13,24 @@ export var InputLabel = function InputLabel(_ref) {
     required = _ref$required === void 0 ? false : _ref$required,
     _ref$useModernStyles = _ref.useModernStyles,
     useModernStyles = _ref$useModernStyles === void 0 ? false : _ref$useModernStyles,
-    size = _ref.size,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 'M' : _ref$size,
     left = _ref.left;
   var palette = useComponentPalette('inputLabel');
   return /*#__PURE__*/React.createElement(S.Wrapper, {
     $palette: palette,
     $disabled: disabled,
     $isLabel: !!label,
-    $useModernStyles: useModernStyles
+    $useModernStyles: useModernStyles,
+    $marginTop: useModernStyles && MODERN_STYLE_SIZE_PARAMS_MAP[size].$labelPaddingTop < 0 && !!label ? -MODERN_STYLE_SIZE_PARAMS_MAP[size].$labelPaddingTop : undefined,
+    $paddingTop: useModernStyles ? 0 : 10
   }, label && /*#__PURE__*/React.createElement(S.Label, {
     $palette: palette,
     $inFocus: inFocus,
     variant: size && useModernStyles ? MODERN_STYLE_SIZE_PARAMS_MAP[size].$labelVariant : 'captionRegular',
     $required: required,
     $useModernStyles: useModernStyles,
-    $paddingTop: size && useModernStyles ? MODERN_STYLE_SIZE_PARAMS_MAP[size].$labelPaddingTop : 0,
+    $top: useModernStyles ? MODERN_STYLE_SIZE_PARAMS_MAP[size].$labelPaddingTop : 0,
     $left: left
   }, label), children);
 };

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

@@ -6,15 +6,15 @@ export var Label = styled(Typography).withConfig({
   displayName: "styles__Label",
   componentId: "sc-1prrc3p-0"
 })(["border-radius:10px;position:absolute;top:", ";left:", ";background-color:", ";padding:0 ", "px;z-index:2;transition:color 0.2s ease-in-out 0s;animation:", " 0.15s ease;color:", ";", ""], function (_ref) {
-  var $paddingTop = _ref.$paddingTop;
-  return $paddingTop ? "".concat($paddingTop, "px") : 0;
+  var $top = _ref.$top;
+  return $top ? "".concat($top, "px") : 0;
 }, function (_ref2) {
   var $left = _ref2.$left;
   return typeof $left === 'number' ? "".concat($left, "px") : '10px';
 }, function (_ref3) {
   var $palette = _ref3.$palette,
     $useModernStyles = _ref3.$useModernStyles;
-  return $useModernStyles ? $palette.bgModern : $palette.bg;
+  return $useModernStyles ? 'none' : $palette.bg;
 }, LABEL_PADDING, labelFadeIn, function (_ref4) {
   var $inFocus = _ref4.$inFocus,
     $palette = _ref4.$palette;
@@ -29,15 +29,17 @@ export var Label = styled(Typography).withConfig({
 export var Wrapper = styled.div.withConfig({
   displayName: "styles__Wrapper",
   componentId: "sc-1prrc3p-1"
-})(["position:relative;padding-top:", "px;width:100%;opacity:", ";&:hover ", "{", ";}"], function (_ref6) {
-  var $isLabel = _ref6.$isLabel,
-    $useModernStyles = _ref6.$useModernStyles;
-  return $isLabel || $useModernStyles ? 10 : 0;
-}, function (_ref7) {
-  var $disabled = _ref7.$disabled;
+})(["position:relative;width:100%;opacity:", ";margin-top:", "px;padding-top:", "px;&:hover ", "{", ";}"], function (_ref6) {
+  var $disabled = _ref6.$disabled;
   return $disabled ? 0.5 : 1;
-}, Label, function (_ref8) {
-  var $disabled = _ref8.$disabled,
-    $palette = _ref8.$palette;
+}, function (_ref7) {
+  var $marginTop = _ref7.$marginTop;
+  return $marginTop || 0;
+}, function (_ref8) {
+  var $paddingTop = _ref8.$paddingTop;
+  return $paddingTop;
+}, Label, function (_ref9) {
+  var $disabled = _ref9.$disabled,
+    $palette = _ref9.$palette;
   return !$disabled && css(["color:", ";"], $palette.textHighlight);
 });

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import * as S from './styles';
 import { useComponentPalette } from '../../../palette';
-import { SIZE_PARAMS_MAP } from '../constants';
+import { MODERN_STYLE_SIZE_PARAMS_MAP } from '../constants';
 export var ModernPlaceholder = function ModernPlaceholder(_ref) {
   var visible = _ref.visible,
     _ref$paddingLeft = _ref.paddingLeft,
@@ -14,7 +14,7 @@ export var ModernPlaceholder = function ModernPlaceholder(_ref) {
   var pureInputPalette = useComponentPalette('pureInput');
   var inputLabelPalette = useComponentPalette('inputLabel');
   return /*#__PURE__*/React.createElement(S.Wrapper, {
-    variant: SIZE_PARAMS_MAP[size].variant,
+    variant: MODERN_STYLE_SIZE_PARAMS_MAP[size].variant,
     $visible: visible,
     $paddingLeft: paddingLeft,
     $paddingTop: paddingTop,

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

@@ -16,8 +16,9 @@ import { InputLabel } from '../InputLabel';
 import { PureInput } from '../PureInput';
 import { CountrySelect } from '../CountrySelect';
 import { useMobile } from '../../../hooks/useMedia';
-import { MODERN_STYLE_SIZE_PARAMS_MAP, SIZE_PARAMS_MAP } from '../constants';
+import { MODERN_STYLE_SIZE_PARAMS_MAP } from '../constants';
 import { ModernPlaceholder } from '../ModernPlaceholder';
+import { useInputStyles } from '../_hooks/useInputStyles';
 export var PhoneInput = function PhoneInput(_ref) {
   var onBlur = _ref.onBlur,
     name = _ref.name,
@@ -80,6 +81,17 @@ export var PhoneInput = function PhoneInput(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     country = _useState8[0],
     setCountry = _useState8[1];
+  var _useInputStyles = useInputStyles({
+      isHaveValue: !!inputValue,
+      useModernStyles: useModernStyles,
+      size: size,
+      label: label,
+      inFocus: inFocus,
+      placeholder: ''
+    }),
+    inputLabel = _useInputStyles.inputLabel,
+    paddingAndVariantOptions = _useInputStyles.paddingAndVariantOptions,
+    isHideModernPlaceholder = _useInputStyles.isHideModernPlaceholder;
   var handleChangeCountry = useCallback(function (countryCode) {
     setCountry(countryCode);
     if (onCountryChange) {
@@ -154,24 +166,6 @@ export var PhoneInput = function PhoneInput(_ref) {
     if (isInnerErrorHighlight) return isHaveInputError;
     return false;
   }, [hasError, isFirstBlur, isHaveInputError, isInnerErrorHighlight]);
-  var inputLabel = useMemo(function () {
-    if (useModernStyles) {
-      if (inputValue || inFocus) {
-        return label;
-      } else {
-        return undefined;
-      }
-    } else {
-      return label;
-    }
-  }, [useModernStyles, inputValue, inFocus, label]);
-  var paddingOptions = useMemo(function () {
-    if ((inputValue || inFocus) && useModernStyles && inputLabel) {
-      return MODERN_STYLE_SIZE_PARAMS_MAP[size];
-    } else {
-      return SIZE_PARAMS_MAP[size];
-    }
-  }, [inputValue, useModernStyles, size, inFocus, inputLabel]);
   var inputPlaceholder = useMemo(function () {
     if (useModernStyles) {
       return undefined;
@@ -180,9 +174,6 @@ export var PhoneInput = function PhoneInput(_ref) {
     }
   }, [country, currentCountriesPhoneRules, useModernStyles]);
   var modernPlaceholderText = label || currentCountriesPhoneRules[country].placeholder;
-  var isModernPlaceholderVisible = useMemo(function () {
-    return !inFocus && !inputValue;
-  }, [inFocus, inputValue]);
   return /*#__PURE__*/React.createElement(InputLabel, {
     inFocus: inFocus,
     label: inputLabel,
@@ -192,9 +183,9 @@ export var PhoneInput = function PhoneInput(_ref) {
     size: size,
     left: useModernStyles ? 65 : undefined
   }, /*#__PURE__*/React.createElement(S.InputLabelContent, null, useModernStyles && /*#__PURE__*/React.createElement(ModernPlaceholder, {
-    visible: isModernPlaceholderVisible,
+    visible: !isHideModernPlaceholder,
     paddingLeft: isHaveSelectCountries ? 75 : 18,
-    paddingTop: SIZE_PARAMS_MAP[size].paddingTop,
+    paddingTop: MODERN_STYLE_SIZE_PARAMS_MAP[size].$placeholderPaddingTop,
     size: size,
     required: required
   }, modernPlaceholderText), !!(countrySelectOptions !== null && countrySelectOptions !== void 0 && countrySelectOptions.length) && /*#__PURE__*/React.createElement(S.InputLabelFloatWrapper, null, /*#__PURE__*/React.createElement(S.CountrySelectWrapper, null, /*#__PURE__*/React.createElement(CountrySelect, {
@@ -230,7 +221,7 @@ export var PhoneInput = function PhoneInput(_ref) {
     autoComplete: 'new-password',
     inputMode: "numeric",
     autoFocus: autoFocus
-  }, paddingOptions, {
+  }, paddingAndVariantOptions, {
     useModernStyles: useModernStyles
   }, pureInputProps)))));
 };

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

@@ -1,5 +1,5 @@
 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 { useInputFocus } from '../../../hooks/useInputFocus';
 import { InputLabel } from '../InputLabel';
@@ -9,8 +9,7 @@ import { useFilters } from './hooks/useFilters';
 import { useNormalizers } from './hooks/useNormalizers';
 import { useIncrement } from './hooks/useIncrement';
 import { useIncrementDisabledFlags } from './hooks/useIncrementDisabledFlags';
-import { MODERN_STYLE_SIZE_PARAMS_MAP, SIZE_PARAMS_MAP } from '../constants';
-import { ModernPlaceholder } from '../ModernPlaceholder';
+import { useInputStyles } from '../_hooks/useInputStyles';
 export var PositiveIntegerInput = function PositiveIntegerInput(_ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
@@ -35,6 +34,17 @@ export var PositiveIntegerInput = function PositiveIntegerInput(_ref) {
     inFocus = _useInputFocus.inFocus,
     handleFocus = _useInputFocus.handleFocus,
     handleBlur = _useInputFocus.handleBlur;
+  var _useInputStyles = useInputStyles({
+      isHaveValue: typeof value === 'number',
+      useModernStyles: useModernStyles,
+      size: size,
+      label: label,
+      inFocus: inFocus,
+      placeholder: placeholder
+    }),
+    inputLabel = _useInputStyles.inputLabel,
+    paddingAndVariantOptions = _useInputStyles.paddingAndVariantOptions,
+    modernPlaceholder = _useInputStyles.modernPlaceholder;
   var filters = useFilters({
     max: max
   });
@@ -63,40 +73,12 @@ export var PositiveIntegerInput = function PositiveIntegerInput(_ref) {
   var handleDown = useCallback(function () {
     onChange(decrement(value));
   }, [decrement, value, onChange]);
-  var modernInputPlaceholder = useMemo(function () {
-    return placeholder || label;
-  }, [label, placeholder]);
-  var isModernPlaceholderVisible = useMemo(function () {
-    return !inFocus && value === null;
-  }, [inFocus, value]);
-  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]);
   return /*#__PURE__*/React.createElement(InputLabel, {
     inFocus: inFocus,
     label: inputLabel,
     useModernStyles: useModernStyles,
     size: size
-  }, /*#__PURE__*/React.createElement(S.ControlWrapper, null, useModernStyles && modernInputPlaceholder && /*#__PURE__*/React.createElement(ModernPlaceholder, {
-    visible: isModernPlaceholderVisible,
-    paddingTop: SIZE_PARAMS_MAP[size].paddingTop,
-    size: size
-  }, modernInputPlaceholder), /*#__PURE__*/React.createElement(PureInput, _extends({
+  }, /*#__PURE__*/React.createElement(S.ControlWrapper, null, modernPlaceholder, /*#__PURE__*/React.createElement(PureInput, _extends({
     name: name,
     hasError: hasError,
     inFocus: inFocus,
@@ -106,7 +88,7 @@ export var PositiveIntegerInput = function PositiveIntegerInput(_ref) {
     value: normalizeFrom(value),
     onChange: handleChange,
     paddingRight: upAndDown ? 44 : undefined
-  }, paddingOptions, {
+  }, paddingAndVariantOptions, {
     useModernStyles: useModernStyles
   })), upAndDown && /*#__PURE__*/React.createElement(S.Arrows, null, /*#__PURE__*/React.createElement(S.Arrow, {
     onClick: handleUp,

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,25 @@ 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
+    }),
+    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 +57,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,20 @@ 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
+    }),
+    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 +63,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 +85,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.305",
     "description": "Invoicebox UI",
     "license": "Apache License 2.0",
     "scripts": {