Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixed popup flickering in date picker & bump #2977

Merged
merged 1 commit into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apps/kyb-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# kyb-app

## 0.3.113

### Patch Changes

- Updated dependencies
- @ballerine/[email protected]

## 0.3.112

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions apps/kyb-app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ballerine/kyb-app",
"private": true,
"version": "0.3.112",
"version": "0.3.113",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -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",
Expand Down
7 changes: 7 additions & 0 deletions packages/react-pdf-toolkit/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @ballerine/react-pdf-toolkit

## 1.2.66

### Patch Changes

- Updated dependencies
- @ballerine/[email protected]

## 1.2.65

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/react-pdf-toolkit/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @ballerine/ui

## 0.5.66

### Patch Changes

- Fixed Date Picker popup flickering

## 0.5.65

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down Expand Up @@ -36,6 +36,7 @@ export interface DatePickerProps {
textInputClassName?: string;
onChange: (event: DatePickerChangeEvent) => void;
onBlur?: (event: FocusEvent<any>) => void;
onFocus?: (event: FocusEvent<any>) => void;
}

export const DatePickerInput = ({
Expand All @@ -47,14 +48,14 @@ export const DatePickerInput = ({
textInputClassName,
onChange,
onBlur,
onFocus,
}: DatePickerProps) => {
const {
outputValueFormat = 'iso',
inputDateFormat = 'MM/DD/YYYY',
disableFuture = false,
disablePast = false,
} = params || {};
const [isFocused, setFocused] = useState(false);

const serializeValue = useCallback(
(value: Dayjs): string => {
Expand Down Expand Up @@ -108,53 +109,6 @@ export const DatePickerInput = ({
return deserializeValue(_value);
}, [_value, deserializeValue]);

const Field = useMemo(() => {
const Component: FunctionComponent<TextFieldProps> = props => {
return (
<TextField
{...props}
variant="standard"
fullWidth
size="small"
onFocus={e => {
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 (
<ThemeProvider theme={muiTheme}>
<LocalizationProvider dateAdapter={AdapterDayjs}>
Expand All @@ -164,10 +118,11 @@ export const DatePickerInput = ({
disabled={disabled}
value={value}
onChange={handleChange}
onBlur={onBlur}
onFocus={onFocus}
reduceAnimations
format={inputDateFormat}
slots={{
textField: Field,
openPickerIcon: () => <CalendarDays size="16" color="#64748B" className="opacity-50" />,
rightArrowIcon: () => (
<ChevronRight size="18" className="hover:text-muted-foreground cursor-pointer" />
Expand Down Expand Up @@ -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',
},
},
}}
/>
</LocalizationProvider>
Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion services/workflows-service/prisma/data-migrations
Loading