diff --git a/apps/kyb-app/CHANGELOG.md b/apps/kyb-app/CHANGELOG.md index b803b7f0ad..0ac62969e7 100644 --- a/apps/kyb-app/CHANGELOG.md +++ b/apps/kyb-app/CHANGELOG.md @@ -1,5 +1,12 @@ # kyb-app +## 0.3.113 + +### Patch Changes + +- Updated dependencies + - @ballerine/ui@0.5.66 + ## 0.3.112 ### Patch Changes diff --git a/apps/kyb-app/package.json b/apps/kyb-app/package.json index 2309c04aef..661aff39e1 100644 --- a/apps/kyb-app/package.json +++ b/apps/kyb-app/package.json @@ -1,7 +1,7 @@ { "name": "@ballerine/kyb-app", "private": true, - "version": "0.3.112", + "version": "0.3.113", "type": "module", "scripts": { "dev": "vite", @@ -19,7 +19,7 @@ "@ballerine/blocks": "0.2.32", "@ballerine/common": "^0.9.66", "@ballerine/workflow-browser-sdk": "0.6.85", - "@ballerine/ui": "0.5.65", + "@ballerine/ui": "0.5.66", "@lukemorales/query-key-factory": "^1.0.3", "@radix-ui/react-icons": "^1.3.0", "@rjsf/core": "^5.9.0", diff --git a/packages/react-pdf-toolkit/CHANGELOG.md b/packages/react-pdf-toolkit/CHANGELOG.md index 739d81e659..71cc487478 100644 --- a/packages/react-pdf-toolkit/CHANGELOG.md +++ b/packages/react-pdf-toolkit/CHANGELOG.md @@ -1,5 +1,12 @@ # @ballerine/react-pdf-toolkit +## 1.2.66 + +### Patch Changes + +- Updated dependencies + - @ballerine/ui@0.5.66 + ## 1.2.65 ### Patch Changes diff --git a/packages/react-pdf-toolkit/package.json b/packages/react-pdf-toolkit/package.json index cc486f303d..bfc9431efe 100644 --- a/packages/react-pdf-toolkit/package.json +++ b/packages/react-pdf-toolkit/package.json @@ -1,7 +1,7 @@ { "name": "@ballerine/react-pdf-toolkit", "private": false, - "version": "1.2.65", + "version": "1.2.66", "types": "./dist/build.d.ts", "main": "./dist/react-pdf-toolkit.js", "module": "./dist/react-pdf-toolkit.mjs", @@ -27,7 +27,7 @@ }, "dependencies": { "@ballerine/config": "^1.1.30", - "@ballerine/ui": "0.5.65", + "@ballerine/ui": "0.5.66", "@react-pdf/renderer": "^3.1.14", "@sinclair/typebox": "^0.31.7", "ajv": "^8.12.0", diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md index 3658283744..3cd9da8440 100644 --- a/packages/ui/CHANGELOG.md +++ b/packages/ui/CHANGELOG.md @@ -1,5 +1,11 @@ # @ballerine/ui +## 0.5.66 + +### Patch Changes + +- Fixed Date Picker popup flickering + ## 0.5.65 ### Patch Changes diff --git a/packages/ui/package.json b/packages/ui/package.json index 603748927f..573d5652fe 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,7 +1,7 @@ { "name": "@ballerine/ui", "private": false, - "version": "0.5.65", + "version": "0.5.66", "type": "module", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/ui/src/components/molecules/inputs/DatePickerInput/DatePickerInput.tsx b/packages/ui/src/components/molecules/inputs/DatePickerInput/DatePickerInput.tsx index ae28ae9240..e6d7bc9f13 100644 --- a/packages/ui/src/components/molecules/inputs/DatePickerInput/DatePickerInput.tsx +++ b/packages/ui/src/components/molecules/inputs/DatePickerInput/DatePickerInput.tsx @@ -1,13 +1,13 @@ import { ctw } from '@/common'; import { muiTheme } from '@/common/mui-theme'; import { Paper } from '@/components/atoms'; -import { TextField, TextFieldProps, ThemeProvider } from '@mui/material'; +import { ThemeProvider } from '@mui/material'; import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'; import { DatePicker } from '@mui/x-date-pickers/DatePicker'; import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'; import dayjs, { Dayjs } from 'dayjs'; import { CalendarDays, ChevronLeft, ChevronRight } from 'lucide-react'; -import { FocusEvent, FunctionComponent, useCallback, useMemo, useState } from 'react'; +import { FocusEvent, useCallback, useMemo } from 'react'; export interface DatePickerChangeEvent { target: { @@ -36,6 +36,7 @@ export interface DatePickerProps { textInputClassName?: string; onChange: (event: DatePickerChangeEvent) => void; onBlur?: (event: FocusEvent) => void; + onFocus?: (event: FocusEvent) => void; } export const DatePickerInput = ({ @@ -47,6 +48,7 @@ export const DatePickerInput = ({ textInputClassName, onChange, onBlur, + onFocus, }: DatePickerProps) => { const { outputValueFormat = 'iso', @@ -54,7 +56,6 @@ export const DatePickerInput = ({ disableFuture = false, disablePast = false, } = params || {}; - const [isFocused, setFocused] = useState(false); const serializeValue = useCallback( (value: Dayjs): string => { @@ -108,53 +109,6 @@ export const DatePickerInput = ({ return deserializeValue(_value); }, [_value, deserializeValue]); - const Field = useMemo(() => { - const Component: FunctionComponent = props => { - return ( - { - setFocused(true); - props.onFocus && props.onFocus(e); - }} - onBlur={e => { - setFocused(false); - onBlur && onBlur(e); - }} - error={!isFocused ? props.error : false} - FormHelperTextProps={{ - classes: { - root: 'pl-2 text-destructive font-inter text-[0.8rem]', - }, - }} - helperText={!isFocused && props.error ? 'Please enter valid date.' : undefined} - InputProps={{ - ...props.InputProps, - classes: { - root: ctw( - 'bg-background border-input rounded-md border text-sm shadow-sm transition-colors px-3 py-0', - textInputClassName, - ), - focused: 'border-input ring-ring ring-1', - disabled: 'opacity-50 cursor-not-allowed', - }, - disableUnderline: true, - }} - inputProps={{ - ...props.inputProps, - 'data-testid': testId, - className: 'py-0 px-0 h-9', - }} - /> - ); - }; - - return Component; - }, [isFocused, onBlur, testId]); - return ( @@ -164,10 +118,11 @@ export const DatePickerInput = ({ disabled={disabled} value={value} onChange={handleChange} + onBlur={onBlur} + onFocus={onFocus} reduceAnimations format={inputDateFormat} slots={{ - textField: Field, openPickerIcon: () => , rightArrowIcon: () => ( @@ -196,6 +151,28 @@ export const DatePickerInput = ({ popper: { className: 'pointer-events-auto', }, + textField: { + size: 'small', + fullWidth: true, + className: ctw( + 'flex h-10 w-full rounded-md border border-input bg-background text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50', + '[&_.MuiOutlinedInput-notchedOutline]:border-none', + '[&_.MuiOutlinedInput-root]:border', + '[&_.MuiOutlinedInput-root]:border-input', + '[&_.MuiOutlinedInput-root]:rounded-md', + '[&_.MuiOutlinedInput-root.Mui-focused]:border-ring', + '[&_.MuiOutlinedInput-root.Mui-focused]:ring-1', + '[&_.MuiOutlinedInput-root.Mui-focused]:ring-ring', + '[&_.MuiFormControl-root]:p-0', + textInputClassName, + ), + inputProps: { + 'data-test-id': testId, + }, + InputProps: { + className: 'focus:outline-none', + }, + }, }} /> diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0f8dc7fc9a..cc42090e01 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -536,7 +536,7 @@ importers: specifier: ^0.9.66 version: link:../../packages/common '@ballerine/ui': - specifier: 0.5.65 + specifier: 0.5.66 version: link:../../packages/ui '@ballerine/workflow-browser-sdk': specifier: 0.6.85 @@ -1516,7 +1516,7 @@ importers: specifier: ^1.1.30 version: link:../config '@ballerine/ui': - specifier: 0.5.65 + specifier: 0.5.66 version: link:../ui '@react-pdf/renderer': specifier: ^3.1.14 @@ -25455,7 +25455,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@4.9.5) + '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@4.9.3) debug: 3.2.7 eslint: 8.54.0 eslint-import-resolver-node: 0.3.9 @@ -25514,7 +25514,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@5.1.6) + '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@4.9.5) debug: 3.2.7 eslint: 8.54.0 eslint-import-resolver-node: 0.3.9 @@ -25620,7 +25620,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@4.9.5) + '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@4.9.3) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -25690,7 +25690,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@5.1.6) + '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@4.9.5) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -26007,7 +26007,7 @@ packages: '@typescript-eslint/eslint-plugin': optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0)(typescript@5.1.6) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0)(typescript@4.9.5) eslint: 8.54.0 eslint-rule-composer: 0.3.0 dev: true diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations index ba327c90ee..fdebde93d1 160000 --- a/services/workflows-service/prisma/data-migrations +++ b/services/workflows-service/prisma/data-migrations @@ -1 +1 @@ -Subproject commit ba327c90ee5c331c4bc2a2f9377cb136043f387e +Subproject commit fdebde93d13e30b9687f29089bca141d00a7e852