Skip to content

Commit fc33548

Browse files
committed
Merge remote-tracking branch 'origin' into feat-picker
2 parents 3ef2429 + 70db1f6 commit fc33548

File tree

5 files changed

+28
-16
lines changed

5 files changed

+28
-16
lines changed

.changeset/mighty-steaks-hope.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @cube-dev/ui-kit
22

3+
## 0.83.2
4+
5+
### Patch Changes
6+
7+
- [#835](https://github.com/cube-js/cube-ui-kit/pull/835) [`97925cab`](https://github.com/cube-js/cube-ui-kit/commit/97925cabf6babdfc546436cb59d24967a826fb74) Thanks [@tenphi](https://github.com/tenphi)! - Fix qa prop in Radio component.
8+
9+
- [#837](https://github.com/cube-js/cube-ui-kit/pull/837) [`f80593b8`](https://github.com/cube-js/cube-ui-kit/commit/f80593b89bba6c638d8cfd795e9ad5b02609e75a) Thanks [@tenphi](https://github.com/tenphi)! - Fix qa prop on TextInputBase.
10+
11+
## 0.83.1
12+
13+
### Patch Changes
14+
15+
- [#832](https://github.com/cube-js/cube-ui-kit/pull/832) [`50cf8a77`](https://github.com/cube-js/cube-ui-kit/commit/50cf8a77c6ce34d8d8be011a3fd9c897e80ef9c5) Thanks [@tenphi](https://github.com/tenphi)! - Fix qa prop binding in ComboBox.
16+
17+
- [#831](https://github.com/cube-js/cube-ui-kit/pull/831) [`9995e8a5`](https://github.com/cube-js/cube-ui-kit/commit/9995e8a5ed4a31166d40e46f7e5e1d6f12d940f8) Thanks [@tenphi](https://github.com/tenphi)! - Fix popover transitions in ComboBox and Select. Fix transitions in Tooltip.
18+
319
## 0.83.0
420

521
### Minor Changes

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cube-dev/ui-kit",
3-
"version": "0.83.0",
3+
"version": "0.83.2",
44
"type": "module",
55
"description": "UIKit for Cube Projects",
66
"repository": {

src/components/fields/ComboBox/ComboBox.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ type FilterFn = (textValue: string, inputValue: string) => boolean;
6262
export type PopoverTriggerAction = 'focus' | 'input' | 'manual';
6363

6464
const ComboBoxWrapperElement = tasty({
65+
qa: 'ComboBoxWrapper',
6566
styles: INPUT_WRAPPER_STYLES,
6667
});
6768

@@ -673,6 +674,7 @@ function useComboBoxKeyboard({
673674
// Component: ComboBoxInput
674675
// ============================================================================
675676
interface ComboBoxInputProps {
677+
qa?: string;
676678
inputRef: RefObject<HTMLInputElement>;
677679
id?: string;
678680
value: string;
@@ -691,13 +693,12 @@ interface ComboBoxInputProps {
691693
hasResults: boolean;
692694
comboBoxId: string;
693695
listStateRef: RefObject<any>;
694-
isLoading?: boolean;
695-
allowsCustomValue?: boolean;
696696
}
697697

698698
const ComboBoxInput = forwardRef<HTMLInputElement, ComboBoxInputProps>(
699699
function ComboBoxInput(
700700
{
701+
qa,
701702
inputRef,
702703
id,
703704
value,
@@ -716,8 +717,6 @@ const ComboBoxInput = forwardRef<HTMLInputElement, ComboBoxInputProps>(
716717
hasResults,
717718
comboBoxId,
718719
listStateRef,
719-
isLoading,
720-
allowsCustomValue,
721720
},
722721
ref,
723722
) {
@@ -726,7 +725,7 @@ const ComboBoxInput = forwardRef<HTMLInputElement, ComboBoxInputProps>(
726725
return (
727726
<InputElement
728727
ref={combinedRef}
729-
qa="Input"
728+
qa={qa}
730729
id={id}
731730
type="text"
732731
value={value}
@@ -1675,7 +1674,6 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
16751674
const comboBoxField = (
16761675
<ComboBoxWrapperElement
16771676
ref={wrapperRef}
1678-
qa={qa || 'ComboBox'}
16791677
mods={mods}
16801678
styles={styles}
16811679
style={{
@@ -1686,6 +1684,7 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
16861684
>
16871685
{prefix ? <div data-element="Prefix">{prefix}</div> : null}
16881686
<ComboBoxInput
1687+
qa={qa || 'ComboBox'}
16891688
inputRef={inputRef}
16901689
id={id}
16911690
value={effectiveInputValue}
@@ -1702,8 +1701,6 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
17021701
hasResults={hasResults}
17031702
comboBoxId={comboBoxId}
17041703
listStateRef={listStateRef}
1705-
isLoading={isLoading}
1706-
allowsCustomValue={allowsCustomValue}
17071704
onChange={handleInputChange}
17081705
onFocus={handleInputFocus}
17091706
/>

src/components/fields/TextInput/TextInputBase.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ export const INPUT_WRAPPER_STYLES: Styles = {
128128
},
129129
};
130130

131-
const InputWrapperElement = tasty({ styles: INPUT_WRAPPER_STYLES });
131+
const InputWrapperElement = tasty({
132+
qa: 'InputWrapper',
133+
styles: INPUT_WRAPPER_STYLES,
134+
});
132135

133136
const STYLE_LIST = [...POSITION_STYLES, ...DIMENSION_STYLES];
134137

@@ -357,14 +360,14 @@ function _TextInputBase(props: CubeTextInputBaseProps, ref) {
357360
const textField = (
358361
<InputWrapperElement
359362
ref={wrapperRef}
360-
qa={qa || 'TextInput'}
361363
mods={modifiers}
362364
data-size={size}
363365
styles={wrapperStyles}
364366
{...wrapperProps}
365367
>
366368
{prefix ? <div data-element="Prefix">{prefix}</div> : null}
367369
<InputElement
370+
qa={qa || 'Input'}
368371
as={ElementType}
369372
{...mergeProps(inputProps, focusProps, hoverProps)}
370373
ref={inputRef}
@@ -397,6 +400,7 @@ function _TextInputBase(props: CubeTextInputBaseProps, ref) {
397400

398401
return wrapWithField(textField, domRef, {
399402
...props,
403+
form: undefined,
400404
styles,
401405
});
402406
}

0 commit comments

Comments
 (0)