@arquimedes.co/eureka-forms 3.0.25-refactor → 3.0.25-test

package/dist/Services/DraftService.js

@@ -5,12 +5,12 @@ export const DraftApi = RootApi.injectEndpoints({
     endpoints: (build) => ({
         mapDraft: build.query({
             queryFn: async ({ idForm, dependencies, property, mapDraftEntities }, { getState }) => {
-                const idOrganization = getState()[idForm].global.idOrganization;
+                const idOrganization = getState().forms[idForm].global.idOrganization;
                 if (mapDraftEntities)
                     return {
                         data: await mapDraftEntities(property, dependencies),
                     };
-                const apiKey = getState()[idForm].global.apiKey;
+                const apiKey = getState().forms[idForm].global.apiKey;
                 if (!apiKey)
                     return { data: undefined };
                 let response;

package/dist/Shared/ErkDatePicker/ErkDatePicker.js

@@ -1,23 +1,55 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React from 'react';
-import { styled, Dialog as MuiDialog, InputAdornment } from '@mui/material';
-import { MobileDatePicker as MuiDatePicker, MobileDateTimePicker as MuiDateTimePicker, DatePickerToolbar as MuiDatePickerToolbar, DateTimePickerToolbar as MuiDateTimePickerToolbar, PickersDay as MuiPickerDay, } from '@mui/x-date-pickers';
+import React, { forwardRef } from 'react';
+import { styled, Dialog as MuiDialog } from '@mui/material';
+import { MobileDatePicker as MuiDatePicker, MobileDateTimePicker as MuiDateTimePicker, DatePickerToolbar as MuiDatePickerToolbar, DateTimePickerToolbar as MuiDateTimePickerToolbar, PickersDay as MuiPickerDay, usePickerContext, } from '@mui/x-date-pickers';
 import { StyledTextField } from '../ErkTextField/ErkTextField';
 import CalendarIcon from '../../Icons/CalendarIcon';
-const StyledDateTimePicker = styled(MuiDateTimePicker)(({ ...props }) => ({
+import { renderTimeViewClock } from '@mui/x-date-pickers/timeViewRenderers';
+const StyledDateTimePicker = styled(MuiDateTimePicker, {
+    shouldForwardProp: (propName) => propName !== 'size',
+})(({ disabled, size }) => ({
     '& .Erk-MuiInputBase-root': {
-        cursor: props.disabled ? 'default' : 'pointer',
+        cursor: disabled ? 'default' : 'pointer',
         '& input': {
-            cursor: props.disabled ? 'default' : 'pointer',
+            cursor: disabled ? 'default' : 'pointer',
             paddingRight: '0px',
         },
     },
+    '& .Erk-MuiInputBase-adornedEnd': {
+        paddingRight: '7px',
+    },
+    '& .Erk-MuiInputAdornment-root': {
+        minWidth: size === 'small' ? 24 : 26,
+        '& .Erk-MuiButtonBase-root': {
+            margin: '-2px',
+            padding: 3,
+            width: size === 'small' ? 28 : 26,
+            height: size === 'small' ? 28 : 26,
+        },
+    },
+    '& .Erk-MuiClock-root': {
+        marginBottom: '16px',
+    },
 }));
-const StyledDatePicker = styled(MuiDatePicker)(({ ...props }) => ({
+const StyledDatePicker = styled(MuiDatePicker, {
+    shouldForwardProp: (propName) => propName !== 'size',
+})(({ disabled, size }) => ({
     '& .Erk-MuiInputBase-root': {
-        cursor: props.disabled ? 'default' : 'pointer',
+        cursor: disabled ? 'default' : 'pointer',
         '& input': {
-            cursor: props.disabled ? 'default' : 'pointer',
+            cursor: disabled ? 'default' : 'pointer',
+        },
+    },
+    '& .Erk-MuiInputBase-adornedEnd': {
+        paddingRight: '7px',
+    },
+    '& .Erk-MuiInputAdornment-root': {
+        minWidth: size === 'small' ? 24 : 26,
+        '& .Erk-MuiButtonBase-root': {
+            margin: '-2px',
+            padding: 3,
+            width: size === 'small' ? 28 : 26,
+            height: size === 'small' ? 28 : 26,
         },
     },
 }));
@@ -27,7 +59,7 @@ const StyledDateTimeToolBar = styled(MuiDateTimePickerToolbar)(({ theme }) => ({
         color: theme.palette.primary.contrastText,
         '& span': {
             fontSize: '1rem',
-            textTransform: 'capitalize',
+            textTransform: 'none',
             color: theme.palette.primary.contrastText,
         },
         '& .Erk-MuiDateTimePickerToolbar-dateContainer': {
@@ -102,9 +134,14 @@ const StyledDay = styled(MuiPickerDay)(({ theme }) => ({
         },
     },
 }));
+// eslint-disable-next-line react/display-name
+const CustomTextField = forwardRef((props, ref) => {
+    const pickerContext = usePickerContext();
+    return _jsx(StyledTextField, { ...props, inputRef: ref, onClick: () => pickerContext.setOpen((prev) => !prev) });
+});
 function CustomDatePicker({ error, required, disabled, readOnly, helperText, size = 'small', labelMargin = 5, pickTime = false, ...others }) {
     if (pickTime) {
-        return (_jsx(StyledDateTimePicker, { ampm: true, reduceAnimations: true, ...others, disabled: disabled ?? readOnly, defaultValue: required ? new Date() : undefined, showDaysOutsideCurrentMonth: true, slotProps: {
+        return (_jsx(StyledDateTimePicker, { ampm: true, size: size, reduceAnimations: true, ...others, disabled: disabled ?? readOnly, defaultValue: required ? new Date() : undefined, showDaysOutsideCurrentMonth: true, slotProps: {
                 actionBar: {
                     actions: ['clear', 'accept'],
                 },
@@ -153,18 +190,22 @@ function CustomDatePicker({ error, required, disabled, readOnly, helperText, siz
                     fullWidth: true,
                     InputProps: {
                         disabled: disabled ?? readOnly,
-                        endAdornment: (_jsx(InputAdornment, { position: "end", children: _jsx(CalendarIcon, { size: size === 'small' ? 22 : 26 }) })),
                     },
                 },
+            }, viewRenderers: {
+                hours: renderTimeViewClock,
+                minutes: renderTimeViewClock,
+                seconds: renderTimeViewClock,
             }, slots: {
                 day: StyledDay,
                 dialog: StyledDialog,
                 toolbar: StyledDateTimeToolBar,
-                textField: StyledTextField,
-            } }));
+                textField: CustomTextField,
+                openPickerIcon: CalendarIcon,
+            }, enableAccessibleFieldDOMStructure: false }));
     }
     else {
-        return (_jsx(StyledDatePicker, { ...others, reduceAnimations: true, readOnly: readOnly, disabled: disabled ?? readOnly, defaultValue: required ? new Date() : undefined, showDaysOutsideCurrentMonth: true, views: ['year', 'month', 'day'], slotProps: {
+        return (_jsx(StyledDatePicker, { ...others, size: size, reduceAnimations: true, readOnly: readOnly, disabled: disabled ?? readOnly, defaultValue: required ? new Date() : undefined, showDaysOutsideCurrentMonth: true, views: ['year', 'month', 'day'], slotProps: {
                 actionBar: {
                     actions: ['clear', 'accept'],
                 },
@@ -203,15 +244,15 @@ function CustomDatePicker({ error, required, disabled, readOnly, helperText, siz
                     placeholder: '',
                     InputProps: {
                         disabled: disabled ?? readOnly,
-                        endAdornment: (_jsx(InputAdornment, { position: "end", children: _jsx(CalendarIcon, { size: size === 'small' ? 20 : 24 }) })),
                     },
                 },
             }, slots: {
                 day: StyledDay,
                 dialog: StyledDialog,
                 toolbar: StyledDateToolBar,
-                textField: StyledTextField,
-            } }));
+                textField: CustomTextField,
+                openPickerIcon: CalendarIcon,
+            }, enableAccessibleFieldDOMStructure: false }));
     }
 }
 /**

package/dist/Utils/store.d.ts

@@ -21,6 +21,7 @@ export declare const store: import("@reduxjs/toolkit").EnhancedStore<{
 }>, import("redux").StoreEnhancer]>>;
 export type AppDispatch = typeof store.dispatch;
 export type AppStore = typeof store;
+export type AppState = ReturnType<typeof store.getState>;
 export declare const getAppState: import("@reduxjs/toolkit").AsyncThunk<RootState, {
     idForm: string;
 }, {

package/dist/Utils/store.js

@@ -31,5 +31,5 @@ export const store = configureStore({
     middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(RootApi.middleware),
 });
 export const getAppState = createAsyncThunk('get/state', ({ idForm }, thunkAPI) => {
-    return thunkAPI.getState()[idForm];
+    return thunkAPI.getState().forms[idForm];
 });

package/dist/hooks.js

@@ -17,6 +17,6 @@ export const useAppDispatch = () => {
 };
 export const useAppSelector = (selector, options) => {
     const idForm = useContext(IdFormContext);
-    return useSelector((state) => selector(state[idForm] ?? defaultRootState), options);
+    return useSelector((state) => selector(state.forms[idForm] ?? defaultRootState), options);
 };
 export const selectBreakPoint = (state) => state.widthStats.currentBreakPoint;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arquimedes.co/eureka-forms",
   "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-  "version":"3.0.25-refactor",
+  "version":"3.0.25-test",
   "scripts": {
     "watch": "tsc --noEmit --watch --project tsconfig.app.json",
     "start": "vite",