@cloud-ru/ds-fields 3.0.16-preview-2f5fa273.0 → 3.0.16-preview-9dd14541.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloud-ru/ds-fields",
3
- "version": "3.0.16-preview-2f5fa273.0",
3
+ "version": "3.0.16-preview-9dd14541.0",
4
4
  "description": "Поля ввода с единой обёрткой label/caption/hint/error и общими осями size/validationState — текст, пароль, число, ползунок, дата, время, выбор, цвет.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -39,24 +39,24 @@
39
39
  "classnames": "^2.5.1",
40
40
  "merge-refs": "^2.0.0",
41
41
  "react-textarea-autosize": "^8.5.9",
42
- "@cloud-ru/ds-adaptive": "1.0.6-preview-2f5fa273.0",
43
- "@cloud-ru/ds-bottom-sheet": "2.2.1-preview-2f5fa273.0",
44
- "@cloud-ru/ds-button": "1.0.8-preview-2f5fa273.0",
45
- "@cloud-ru/ds-calendar": "1.1.26-preview-2f5fa273.0",
46
- "@cloud-ru/ds-divider": "1.0.6-preview-2f5fa273.0",
47
- "@cloud-ru/ds-color-picker": "1.0.25-preview-2f5fa273.0",
48
- "@cloud-ru/ds-dropdown": "1.2.4-preview-2f5fa273.0",
49
- "@cloud-ru/ds-icons": "1.7.5-preview-2f5fa273.0",
50
- "@cloud-ru/ds-field-decorator": "1.1.14-preview-2f5fa273.0",
51
- "@cloud-ru/ds-input-private": "1.0.18-preview-2f5fa273.0",
52
- "@cloud-ru/ds-list": "3.1.4-preview-2f5fa273.0",
53
- "@cloud-ru/ds-loader": "1.0.7-preview-2f5fa273.0",
54
- "@cloud-ru/ds-materials": "2.0.5-preview-2f5fa273.0",
55
- "@cloud-ru/ds-scroll": "1.0.9-preview-2f5fa273.0",
56
- "@cloud-ru/ds-skeleton": "1.0.6-preview-2f5fa273.0",
57
- "@cloud-ru/ds-slider": "1.0.21-preview-2f5fa273.0",
58
- "@cloud-ru/ds-tag": "1.2.4-preview-2f5fa273.0",
59
- "@cloud-ru/ds-tooltip": "1.0.21-preview-2f5fa273.0",
60
- "@cloud-ru/ds-utils": "1.4.2-preview-2f5fa273.0"
42
+ "@cloud-ru/ds-calendar": "1.1.26-preview-9dd14541.0",
43
+ "@cloud-ru/ds-button": "1.0.8-preview-9dd14541.0",
44
+ "@cloud-ru/ds-bottom-sheet": "2.2.1-preview-9dd14541.0",
45
+ "@cloud-ru/ds-dropdown": "1.2.4-preview-9dd14541.0",
46
+ "@cloud-ru/ds-divider": "1.0.6-preview-9dd14541.0",
47
+ "@cloud-ru/ds-field-decorator": "1.1.14-preview-9dd14541.0",
48
+ "@cloud-ru/ds-icons": "1.7.5-preview-9dd14541.0",
49
+ "@cloud-ru/ds-input-private": "1.0.18-preview-9dd14541.0",
50
+ "@cloud-ru/ds-list": "3.1.4-preview-9dd14541.0",
51
+ "@cloud-ru/ds-loader": "1.0.7-preview-9dd14541.0",
52
+ "@cloud-ru/ds-materials": "2.0.5-preview-9dd14541.0",
53
+ "@cloud-ru/ds-scroll": "1.0.9-preview-9dd14541.0",
54
+ "@cloud-ru/ds-skeleton": "1.0.6-preview-9dd14541.0",
55
+ "@cloud-ru/ds-tooltip": "1.0.21-preview-9dd14541.0",
56
+ "@cloud-ru/ds-tag": "1.2.4-preview-9dd14541.0",
57
+ "@cloud-ru/ds-slider": "1.0.21-preview-9dd14541.0",
58
+ "@cloud-ru/ds-utils": "1.4.2-preview-9dd14541.0",
59
+ "@cloud-ru/ds-adaptive": "1.0.6-preview-9dd14541.0",
60
+ "@cloud-ru/ds-color-picker": "1.0.25-preview-9dd14541.0"
61
61
  }
62
62
  }
@@ -125,6 +125,7 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
125
125
 
126
126
  const resolvedAutoFocus = useAdaptiveAutoFocus(autoFocus, layoutPresets);
127
127
  const { layoutType } = useAdaptiveLayout();
128
+ const isMobile = isMobileLayout(layoutType);
128
129
 
129
130
  const inputRef = useRef<HTMLInputElement>(null);
130
131
  // Отдельный ref на реальный <input>: `inputRef.current` перезаписывается span-обёрткой PopoverPrivate.
@@ -549,7 +550,7 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
549
550
  const { postfixButtons, inputTabIndex, onInputKeyDown } = useButtonNavigation({
550
551
  inputRef: inputElementRef,
551
552
  postfixButtons: useMemo(() => [clearButtonSettings, copyButtonSettings], [clearButtonSettings, copyButtonSettings]),
552
- readonly: !searchable || Boolean(readOnly),
553
+ readonly: isMobile || !searchable || Boolean(readOnly),
553
554
  submitKeys: ['Enter', ' ', 'Tab'],
554
555
  });
555
556
 
@@ -621,20 +622,22 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
621
622
  handleOpenChange(true);
622
623
  }
623
624
 
624
- inputElementRef.current?.focus();
625
- }, [disabled, readOnly, open, handleOpenChange]);
625
+ if (!isMobile) {
626
+ inputElementRef.current?.focus();
627
+ }
628
+ }, [disabled, readOnly, open, handleOpenChange, isMobile]);
626
629
 
627
630
  const handleInputFocus = useCallback(
628
631
  (event: FocusEvent<HTMLInputElement>) => {
629
632
  setFocusVisible(event.target.matches(':focus-visible'));
630
633
 
631
- if (searchable) {
634
+ if (searchable && !isMobile) {
632
635
  event.target.select();
633
636
  }
634
637
 
635
638
  onFocusProp?.(event);
636
639
  },
637
- [searchable, onFocusProp],
640
+ [searchable, onFocusProp, isMobile],
638
641
  );
639
642
 
640
643
  const handleInputBlur = (event: FocusEvent<HTMLInputElement>) => {
@@ -682,11 +685,11 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
682
685
  <InputPrivate
683
686
  ref={mergeRefs(ref, inputRef, inputElementRef)}
684
687
  className={cn(fieldStyles.fieldInput, !searchable && styles.readonlyCursor)}
685
- value={inputValue}
688
+ value={isMobile ? selectedLabel : inputValue}
686
689
  onChange={searchable ? handleInputChange : undefined}
687
690
  placeholder={selectedLabel || hasChips ? '' : placeholder}
688
691
  disabled={disabled}
689
- readonly={!searchable || readOnly}
692
+ readonly={isMobile || !searchable || readOnly}
690
693
  id={id}
691
694
  name={name}
692
695
  autoFocus={resolvedAutoFocus}
@@ -812,7 +815,7 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
812
815
  search={
813
816
  isMobileLayout(layoutType) && mobileSearchable && !readOnly && !disabled
814
817
  ? {
815
- value: inputValue,
818
+ value: search?.value ?? (typing ? inputValue : ''),
816
819
  onChange: handleInputChange,
817
820
  onKeyDown: event => {
818
821
  if (tryCommitFromKeyboard(event)) {