@redneckz/wildless-cms-uni-blocks 0.10.5 → 0.10.7

package/mobile/src/ui-kit/Input/InputProps.ts

@@ -10,7 +10,9 @@ export type InputProps = LabelProps & {
   placeholder?: string;
   pattern?: string;
   value?: string;
-  onChange: (value: string) => void;
-  onBlur?: (value: string) => void;
+  onChange?: (value: string) => void;
+  onInput?: (event: any) => void;
+  onFocus?: (event: any) => void;
+  onBlur?: () => void;
   valid?: boolean;
 };

package/mobile/src/ui-kit/InputRange/InputRange.tsx

@@ -1,60 +1,72 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
 import { clamp } from '../../utils/clamp';
-import { getSanitizedValue } from '../../utils/getSanitizedValue';
+import { style } from '../../utils/style';
+import { Text } from '../Text/Text';
 import type { InputRangeProps } from './InputRangeProps';
+import { parseDecimal } from './parseDecimal';
+import { renderRangeWithTicks } from './renderRangeWithTicks';
 
 const DISABLED_INPUT_CLASSES = 'disabled:border-gray disabled:bg-main-divider';
 
+const DEFAULT_MIN = 1;
+const DEFAULT_MAX = 100;
+
 export const InputRange = JSX<InputRangeProps>(
   ({
     className,
     title,
     items = [],
-    min = 1,
-    max = 100,
+    list = [],
+    min = list.length ? 0 : DEFAULT_MIN,
+    max = list.length ? list.length - 1 : DEFAULT_MAX,
     step = 1,
-    value = min,
+    value = list[0] || min,
     disabled = false,
     onChange,
   }) => {
-    const handleChange: JSX.IntrinsicElements['input']['onChange'] = (e) => {
-      if (!onChange) {
-        return;
-      }
+    const [isFocused, setFocused] = useState(false);
+
+    const handleChange = useCallback(
+      (e: { target?: { value?: string } }) => {
+        onChange && onChange(parseDecimal(e.target?.value));
+      },
+      [onChange],
+    );
 
-      onChange(clamp(Number(getSanitizedValue(e.target.value as string)), min, max));
-    };
+    const handleFocus = useCallback(() => {
+      setFocused(true);
+    }, []);
 
-    const inputStyle = {
-      backgroundSize: `${(((value - min) * 100) / (max - min)).toFixed(2)}% 100%`,
-    };
+    const handleBlur = useCallback(() => {
+      setFocused(false);
+      onChange && onChange(list.length ? closestValue(list)(value) : clamp(value || 0, min, max));
+    }, [onChange, value]);
 
     return (
       <div className={className}>
         <label className="block relative">
-          {title ? <span className="text-m-light text-primary-text">{title}</span> : null}
+          {title ? (
+            <Text size="text-m" font="font-light" color="text-primary-text">
+              {title}
+            </Text>
+          ) : null}
           <input
-            className={`m-0 mt-2 font-sans text-h3 w-full h-14 border border-solid border-gray rounded-md
-            outline-none p-0 pl-4 box-border text-primary-text hover:border-primary-hover focus:border-primary-text ${DISABLED_INPUT_CLASSES}`}
-            value={addSpacesBetweenNumbers(value)}
+            className={style(
+              'm-0 mt-2 font-sans text-h3 w-full h-14',
+              'border border-solid border-gray rounded-md outline-none',
+              'p-0 pl-4 box-border',
+              'text-primary-text hover:border-primary-hover focus:border-primary-text',
+              DISABLED_INPUT_CLASSES,
+            )}
+            value={isFocused ? value : addSpacesBetweenNumbers(value)}
             disabled={disabled}
-            onChange={handleChange}
-            onBlur={handleChange}
+            onInput={handleChange as any}
+            onFocus={handleFocus}
+            onBlur={handleBlur}
           />
-          <div className="absolute inset-x-0 -bottom-1 px-4 leading-[18px]">
-            <input
-              className="box-border w-full m-0 cursor-pointer slider"
-              type="range"
-              min={min}
-              max={max}
-              step={step}
-              value={value}
-              disabled={disabled}
-              onChange={handleChange}
-              style={inputStyle}
-            />
-          </div>
+          {renderRangeWithTicks({ list, min, max, step, disabled, value, onChange })}
         </label>
         {renderRangeCaption(items)}
       </div>
@@ -62,14 +74,15 @@ export const InputRange = JSX<InputRangeProps>(
   },
 );
 
-function renderRangeCaption(items: string[]) {
-  return (
-    <div className="flex justify-between my-2">
-      {items.map((item, i) => (
-        <span key={String(i)} className="text-s-light text-secondary-text">
-          {item}
-        </span>
-      ))}
-    </div>
-  );
-}
+const closestValue = (list: number[]) => (_: number) =>
+  list.reduce((prev, curr) => (Math.abs(curr - _) < Math.abs(prev - _) ? curr : prev));
+
+const renderRangeCaption = (items: string[]) => (
+  <div className="flex justify-between my-2">
+    {items.map((item, i) => (
+      <Text key={String(i)} size="text-s-light" color="text-secondary-text">
+        {item}
+      </Text>
+    ))}
+  </div>
+);

package/mobile/src/ui-kit/InputRange/InputRangeProps.ts

@@ -5,6 +5,7 @@ export interface InputRangeProps extends ListContent {
   items?: string[];
   min?: number;
   max?: number;
+  list?: number[];
   step?: number;
   value?: number;
   title?: string;

package/mobile/src/ui-kit/InputRange/parseDecimal.ts

@@ -0,0 +1,6 @@
+export function parseDecimal(value?: string) {
+  const rawValue = (value || '').replace(/\D/g, '');
+  const unsafeDecimal = parseInt(rawValue, 10);
+
+  return Number.isNaN(unsafeDecimal) ? 0 : unsafeDecimal;
+}

package/mobile/src/ui-kit/InputRange/renderRangeWithTicks.tsx

@@ -0,0 +1,62 @@
+import { parseDecimal } from './parseDecimal';
+
+interface RangeWithTicksProps {
+  list: number[];
+  min: number;
+  max: number;
+  step: number;
+  disabled?: boolean;
+  value?: number;
+  onChange?: (value: number) => void;
+}
+
+export function renderRangeWithTicks({
+  list = [],
+  min,
+  max,
+  step,
+  value = list[0] || min,
+  disabled,
+  onChange,
+}: RangeWithTicksProps) {
+  const rangeValue = list.length ? list.indexOf(value) : value;
+  const inputStyle = {
+    backgroundSize: `${(((rangeValue - min) * 100) / (max - min)).toFixed(2)}% 100%`,
+  };
+
+  return (
+    <div>
+      {list.length ? (
+        <div className="absolute w-full flex justify-between -bottom-[3px] px-4">
+          {list.map((_, i) => (
+            <div
+              key={String(i)}
+              className={`w-2 h-2 rounded-full ${
+                rangeValue <= i || disabled ? 'bg-gray' : 'bg-primary-main'
+              }`}
+            />
+          ))}
+        </div>
+      ) : null}
+      <div className="absolute inset-x-0 -bottom-1 px-4 leading-[18px]">
+        <input
+          className="box-border w-full m-0 cursor-pointer slider relative z-10"
+          style={inputStyle}
+          type="range"
+          min={min}
+          max={max}
+          step={step}
+          value={rangeValue}
+          disabled={disabled}
+          onInput={
+            ((e: { target?: { value?: string } }) => {
+              const rawValue = parseDecimal(e.target?.value);
+              const newValue = list.length ? list[rawValue] : rawValue;
+              onChange && onChange(newValue || 0);
+            }) as any
+          }
+        />
+      </div>
+    </div>
+  );
+}

package/mobile/src/ui-kit/PhoneInput/PhoneInput.tsx

@@ -0,0 +1,19 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { Input } from '../Input/Input';
+import type { InputProps } from '../Input/InputProps';
+import { normalizePhone } from './normalizePhone';
+
+export const PhoneInput = JSX<InputProps>(({ children, onChange, ...inputProps }) => {
+  const handleChange = useCallback(
+    ({ target: { value } }: { target: { value?: string } }) =>
+      onChange && onChange(normalizePhone(value || '')),
+    [onChange],
+  );
+
+  return (
+    <Input onInput={handleChange} onFocus={handleChange} {...inputProps}>
+      {children}
+    </Input>
+  );
+});

package/mobile/src/ui-kit/PhoneInput/normalizePhone.ts

@@ -0,0 +1,23 @@
+const isPlaceholder = (_: string) => _ === '_';
+const isDigit = (_: string) => /\d/.test(_);
+const isWildcard = (_: string) => isPlaceholder(_) || isDigit(_);
+
+const phonePattern = [...'+7 (___) ___-__-__'];
+
+const firstPlaceholderIndex = phonePattern.findIndex(isPlaceholder);
+const phoneWildcardIndicies = phonePattern.map((_, i) =>
+  isWildcard(_) ? phonePattern.slice(0, i).filter(isWildcard).length : -1,
+);
+
+export function normalizePhone(phone: string): string {
+  const phoneNumbers = phone.replace(/\D/g, '');
+  const applyPlaceholder = (_: string, i: number) =>
+    isDigit(_) ? _ : phoneNumbers.charAt(phoneWildcardIndicies[i]) || _;
+
+  const result = phonePattern.map(applyPlaceholder);
+  const resultLength = phoneWildcardIndicies.indexOf(phoneNumbers.length - 1) + 1;
+
+  return (
+    resultLength ? result.slice(0, Math.max(firstPlaceholderIndex, resultLength)) : result
+  ).join('');
+}

package/mobile/src/ui-kit/RadioButtonGroup/RadioButtonGroup.tsx

@@ -27,7 +27,7 @@ export const RadioButtonGroup = JSX<RadioButtonGroupProps>(
           key={String(id)}
           isRadio
           text={text}
-          checked={checkedItem === id}
+          value={checkedItem === id}
           onChange={() => onChangeCheckedItem && onChangeCheckedItem(id)}
         />
       ))}

package/mobile/src/ui-kit/Select/Select.tsx

@@ -1,58 +1,53 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '../../hooks/useBool';
 import { useOutsideClick } from '../../hooks/useOutsideClick';
 import { LabelProps } from '../../model/HeadlineType';
 import { Text } from '../../ui-kit/Text/Text';
+import { style } from '../../utils/style';
 import { Icon } from '../Icon/Icon';
 
-export interface OptionProps {
+export interface Option {
   key: string;
-  text: string;
+  text?: string;
 }
 
 export type SelectProps = LabelProps & {
   className?: string;
-  value?: OptionProps;
-  onChange: (value: OptionProps) => void;
-  options: OptionProps[];
+  options?: Option[];
+  value?: Option;
+  valid?: boolean;
   isBorder?: boolean;
   placeholder?: string;
-  valid?: boolean;
-  onValidate?: (value: string) => void;
+  onChange?: (value: Option) => void;
 };
 
 export const Select = JSX<SelectProps>(
   ({
     className = '',
-    isBorder = true,
     label,
     options = [],
     value,
-    onChange,
-    placeholder = '',
     valid = true,
-    onValidate,
+    isBorder = true,
+    placeholder = '',
+    onChange,
   }) => {
-    const [selectedItem, setSelectedItem] = useState(options[0] || { key: '', text: '' });
-    const [isOpen, setIsOpen] = useState(false);
-    const handleClickOutside = useCallback(() => setIsOpen(false), []);
-    const wrapperRef = useOutsideClick<HTMLDivElement>(handleClickOutside);
-
-    const choiceOption = (option: OptionProps) => {
-      setSelectedItem(option);
-      setIsOpen(false);
-      onChange(option);
-      onValidate && onValidate(option.text);
-    };
+    const [isOpen, { setFalse: close, toggle }] = useBool();
+    const wrapperRef = useOutsideClick<HTMLDivElement>(close);
 
-    const isSelected = (option: OptionProps) => Boolean(option.key === selectedItem.key);
+    const handleChange = useCallback(
+      (option: Option) => {
+        close();
+        onChange && onChange(option);
+      },
+      [onChange],
+    );
 
-    useEffect(() => {
-      setSelectedItem(value || { key: '', text: '' });
-    }, [value]);
+    const isSelected = (option: Option) => option.key === value?.key;
 
     return (
-      <div className={`${className}`} ref={wrapperRef}>
+      <div className={className} ref={wrapperRef}>
         {label ? (
           <div className="mb-2">
             <Text size="text-m" color="text-primary-text" font="font-light">
@@ -60,28 +55,28 @@ export const Select = JSX<SelectProps>(
             </Text>
           </div>
         ) : null}
-        <div className={`relative ${isOpen ? 'z-20' : 'z-10'}`}>
+        <div className={style('relative', isOpen ? 'z-20' : 'z-10')}>
           <div
-            className={`text-l flex justify-between items-center mb-0.5 text-primary-text cursor-pointer
-            ${getBorderStyle(isBorder, valid)}`}
-            onClick={() => setIsOpen(!isOpen)}
+            className={style(
+              'text-l flex justify-between items-center mb-0.5 text-primary-text cursor-pointer',
+              getBorderStyle(isBorder, valid),
+            )}
+            onClick={toggle}
           >
             <p className="p-4 pr-8 h-14 overflow-hidden text-ellipsis whitespace-nowrap">
-              {selectedItem?.text || placeholder}
+              {formatOption(value) || placeholder}
             </p>
             <Icon
+              className={style('absolute right-3', isOpen ? '' : 'rotate-180')}
               name="ArrowUpIcon"
               width="16"
               height="16"
-              className={`absolute right-3 ${isOpen ? '' : 'rotate-180'}`}
             />
           </div>
           {options?.length ? (
-            <div className={`h-0 ${renderOptionsStyle(isOpen)}`}>
-              <div
-                className={`bg-white text-l max-h-64 overflow-y-auto overflow-x-hidden rounded-md shadow-[0_4px_25px_rgba(0,0,0,0.07)]`}
-              >
-                {options.map(renderOption(choiceOption, isOpen, isSelected))}
+            <div className={style('h-0', isOpen ? '' : 'overflow-hidden')}>
+              <div className="bg-white text-l max-h-64 overflow-y-auto overflow-x-hidden rounded-md shadow-[0_4px_25px_rgba(0,0,0,0.07)]">
+                {options.map(renderOption(handleChange, isOpen, isSelected))}
               </div>
             </div>
           ) : null}
@@ -91,37 +86,35 @@ export const Select = JSX<SelectProps>(
   },
 );
 
-const renderOptionsStyle = (isOpen: boolean) => (isOpen ? '' : 'overflow-hidden');
-
 const renderOption =
   (
-    choiceOption: (option: OptionProps) => void,
+    handleChange: (option: Option) => void,
     isOpen: boolean,
-    isSelected: (option: OptionProps) => boolean,
+    isSelected: (option: Option) => boolean,
   ) =>
-  (option: OptionProps, i: number) => {
-    return (
+  (option: Option, i: number) =>
+    (
       <div
         key={String(i)}
         onClick={() => {
-          choiceOption(option);
+          handleChange(option);
         }}
         className="flex px-4 py-3 cursor-pointer hover:bg-main-divider pr-11 relative"
       >
-        <span className="min-h-6">{option.text}</span>
+        <span className="min-h-6">{formatOption(option)}</span>
         <Icon
           name="DoneSimpleIcon"
           width="16"
           height="16"
-          className={['absolute right-4 pt-0.5', isSelected(option) && isOpen ? '' : 'hidden'].join(
-            ' ',
-          )}
+          className={style('absolute right-4 pt-0.5', isSelected(option) && isOpen ? '' : 'hidden')}
         />
       </div>
     );
-  };
 
-const getBorderStyle = (isBorder: boolean, valid: boolean) => `
-  ${isBorder ? 'border rounded-md hover:border-primary-hover' : ''} ${
-  valid ? ' border-gray' : 'border-error'
-} `;
+const formatOption = (_?: Option): string => _?.text || _?.key || '';
+
+const getBorderStyle = (isBorder: boolean, valid: boolean) =>
+  style(
+    isBorder ? 'border rounded-md hover:border-primary-hover' : '',
+    valid ? ' border-gray' : 'border-error',
+  );

package/mobile/src/ui-kit/SlideCheckbox/SlideCheckbox.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { style } from '../../utils/style';
 import { Text } from '../Text/Text';
 
 interface SlideCheckboxProps {
@@ -12,25 +13,25 @@ export const SlideCheckbox = JSX<SlideCheckboxProps>(
     <div
       role={type}
       aria-checked={value}
-      className="flex justify-start items-center w-full cursor-pointer mb-4"
+      className="flex justify-start items-center w-full cursor-pointer mb-3"
       onClick={() => onChange && onChange(!value)}
     >
       <div
-        className={`relative flex-shrink-0 duration-300 w-9 h-5 mr-3 rounded-2xl ${
-          value ? 'bg-primary-main' : 'bg-main-divider'
-        }`}
+        className={style(
+          'relative flex-shrink-0 duration-300 w-9 h-5 mr-3 rounded-2xl',
+          value ? 'bg-primary-main' : 'bg-main-divider',
+        )}
       >
         <div
-          className={`absolute opacity-80 duration-500 top-0.5 w-4 h-4 bg-white rounded-full ${
-            value ? 'left-[50%]' : 'left-[5%]'
-          }`}
+          className={style(
+            'absolute opacity-80 duration-500 top-0.5 w-4 h-4 bg-white rounded-full',
+            value ? 'left-[50%]' : 'left-[5%]',
+          )}
         />
       </div>
-      <div>
-        <Text size="text-m" font="font-light" color="text-primary-text">
-          {text}
-        </Text>
-      </div>
+      <Text size="text-l" font="font-light" color="text-primary-text">
+        {text}
+      </Text>
     </div>
   ),
 );

package/mobile/src/utils/getSanitizedValue.ts

@@ -1 +1 @@
-export const getSanitizedValue = (_: string): string => _.split(/\s+/).join('');
+export const getSanitizedValue = (_: string): string => _.replace(/\s/g, '');

package/mobile/src/validation/and.ts

@@ -0,0 +1,6 @@
+import { ValidationInfo, Validator } from './validator';
+
+export const and =
+  (...validators: Validator[]): Validator =>
+  (data) =>
+    validators.flatMap((_) => _(data)) as ValidationInfo;

package/mobile/src/validation/objectValidator.ts

@@ -0,0 +1,10 @@
+import { ValidationInfo, Validator } from './validator';
+
+export const objectValidator =
+  <VMap extends Record<string, Validator>>(validatorsMap: VMap) =>
+  <O extends Partial<{ [P in keyof VMap]: Parameters<VMap[P]>[0] }>>(o: O): ValidationInfo =>
+    (o &&
+      (Object.entries(validatorsMap).flatMap(([key, validator]) =>
+        validator(o[key]),
+      ) as ValidationInfo)) ||
+    [];

package/mobile/src/validation/pattern.ts

@@ -0,0 +1,4 @@
+import { validator } from './validator';
+
+export const pattern = (regexp: RegExp) =>
+  validator((_) => typeof _ === 'string' && regexp.test(_));

package/mobile/src/validation/required.ts

@@ -0,0 +1,3 @@
+import { validator } from './validator';
+
+export const required = validator((_) => _ !== null && _ !== undefined && _ !== '');

package/mobile/src/validation/validator.ts

@@ -0,0 +1,21 @@
+type ValidationMessage = string;
+
+type ValidationSuccess = [];
+type ValidationErr = [ValidationMessage, ...ValidationMessage[]];
+
+export type ValidationInfo = ValidationSuccess | ValidationErr;
+
+export type Validator<T = any> = (_: T) => ValidationInfo;
+
+export const isValidationSuccess = (info: ValidationInfo): info is ValidationSuccess =>
+  !info?.length;
+export const isValidationErr = (info: ValidationInfo): info is ValidationErr =>
+  Boolean(info?.length);
+
+type Predicate<T = any> = (_: T) => boolean;
+
+export const validator =
+  <T = any>(predicate: Predicate<T>) =>
+  (message: string): Validator<T> =>
+  (_) =>
+    predicate(_) ? [] : [message];

package/mobile/src/validation/withValidator.ts

@@ -0,0 +1,21 @@
+import { ValidationInfo, Validator } from './validator';
+
+interface FieldProps<V> {
+  value?: V;
+  isDirty?: boolean;
+}
+
+export const withValidator = <V, P extends FieldProps<V> = FieldProps<V>>(
+  props: P,
+  validator: Validator<V | undefined>,
+): P & { errors?: ValidationInfo; error?: ValidationInfo[0] } => {
+  const { value, isDirty } = props;
+
+  const errors: ValidationInfo = isDirty ? validator(value) : [];
+
+  return {
+    ...props,
+    errors,
+    error: errors[0],
+  };
+};

package/mobile/src/wlc.json

@@ -3,6 +3,5 @@
   "FORCED_DRAFT_FLOW": false,
   "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
   "SITEMAP": "sayt-rshb",
-  "CHAT_BOT": "personal",
-  "BASE_PATH": "/natural/"
+  "CHAT_BOT": "personal"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.10.5",
+  "version": "0.10.7",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -63,8 +63,8 @@
     "bundle",
     "mobile/bundle",
     "fonts",
-    "mobile/src",
     "src",
+    "mobile/src",
     "cosmos-static/icons",
     "tailwind.config.cjs",
     "!**/*.spec.*"

package/src/components/ApplicationForm/AcquiringFormState.ts

@@ -0,0 +1,12 @@
+import type { Option } from '../../ui-kit/Select/Select';
+
+export interface AcquiringFormState {
+  acquiringType?: Option;
+  region?: Option;
+  fullName: string;
+  inn: string;
+  name: string;
+  phone: string;
+  onlineCheckout: boolean;
+  posTerminal: boolean;
+}

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -4,6 +4,7 @@ import { CorporateLeadAPI } from '../../api/CorporateLeadAPI';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
+import { style } from '../../utils/style';
 import { ApplicationFormAcquiring } from './ApplicationFormAcquiring';
 import { ApplicationFormBusinessCard } from './ApplicationFormBusinessCard';
 import type { ApplicationFormContent } from './ApplicationFormContent';
@@ -26,9 +27,9 @@ const COMPONENTS_MAP = {
 const API = CorporateLeadAPI();
 
 export const ApplicationForm = JSX<ApplicationFormProps>((props) => {
-  const { className = '', title, typeForm = 'credit', button, link, ...rest } = props;
+  const { className, title, typeForm = 'credit', button, link, ...rest } = props;
 
-  const [responceType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
+  const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
 
   const handleSubmit = useCallback(async (data: Record<string, string>) => {
     const status = (await API.send(data)) ? 'OK' : 'Fail';
@@ -38,11 +39,11 @@ export const ApplicationForm = JSX<ApplicationFormProps>((props) => {
   }, []);
 
   return (
-    <BlockWrapper className={`font-sans bg-white p-[50px] pb-9 ${className}`} {...rest}>
+    <BlockWrapper className={style('font-sans bg-white p-default pb-9', className)} {...rest}>
       <div className="container max-w-[978px]">
         {title ? <Heading headingType="h3" title={title} className="text-center mb-8" /> : null}
-        {COMPONENTS_MAP[typeForm]({ button, link, handleSubmit })}
-        {responceType ? <ResponseNotification responceType={responceType} /> : null}
+        {COMPONENTS_MAP[typeForm]({ button, link, onSubmit: handleSubmit })}
+        {responseType ? <ResponseNotification responseType={responseType} /> : null}
       </div>
     </BlockWrapper>
   );