grep-components 2.6.0-GREPF-2585.2 → 2.6.0-GREPF-2348.1

package/dist/build/components/GrepDateRange/index.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
+import { GridSpacing } from '@mui/material/Grid';
 import { DateRangeValue } from '../../utils/dateHelper';
 import { GrepDatePickerProps } from '../GrepDatePicker';
 import { Dayjs } from 'dayjs';
-import { GridSpacing } from '@mui/material/Grid2';
 type CommonProperties = Pick<GrepDatePickerProps, 'variant' | 'margin' | 'sx'>;
 interface Props extends CommonProperties {
     from: Omit<GrepDatePickerProps, 'onChange'>;

package/dist/build/hooks/use-date.d.ts

@@ -1,4 +1,5 @@
-import DateTime, { ParseableDate } from '../utils/dateHelper';
+import DateTime from '../utils/dateHelper';
+import { ParseableDate } from '../utils/dateHelper';
 export type DateInput = ParseableDate | null;
 export type DateState = DateTime.Dayjs | null;
 export declare const defaultOptions: {

package/dist/build/index.d.ts

@@ -28,7 +28,7 @@ export { default as ServiceMessage } from './components/ServiceMessage';
 export { default as SortableTable } from './components/SortableTable';
 export { default as GrepEditor } from './components/GrepEditor';
 export { default as AppBar } from './components/AppBar/AppBar';
-export type { ParseableDate } from './utils/dateHelper';
+export { ParseableDate } from './utils/dateHelper';
 export { Utils };
 export * from './components';
 export * from './hooks';

package/dist/index.js

@@ -39,9 +39,9 @@ import Close from '@mui/icons-material/Close';
 import Search from '@mui/icons-material/Search';
 import CircularProgress$1 from '@mui/material/CircularProgress';
 import Info from '@mui/icons-material/Info';
+import Grid from '@mui/material/Grid';
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 import { LocalizationProvider, DesktopDatePicker } from '@mui/x-date-pickers';
-import Grid2 from '@mui/material/Grid2';
 import ListItem$1 from '@mui/material/ListItem';
 import Collapse$1 from '@mui/material/Collapse';
 import ExpandLess from '@mui/icons-material/ExpandLess';
@@ -635,6 +635,7 @@ function handleInterpolation(mergedProps, registered, interpolation) {
           }
 
           var styles = serializedStyles.styles + ";";
+
           return styles;
         }
 
@@ -708,9 +709,10 @@ function createStringFromObject(mergedProps, registered, obj) {
   return string;
 }
 
-var labelPattern = /label:\s*([^\s;{]+)\s*(;|$)/g; // this is the cursor for keyframes
+var labelPattern = /label:\s*([^\s;\n{]+)\s*(;|$)/g;
 // keyframes are stored on the SerializedStyles object as a linked list
 
+
 var cursor;
 function serializeStyles(args, registered, mergedProps) {
   if (args.length === 1 && typeof args[0] === 'object' && args[0] !== null && args[0].styles !== undefined) {
@@ -740,7 +742,7 @@ function serializeStyles(args, registered, mergedProps) {
 
       styles += templateStringsArr[i];
     }
-  } // using a global regex with .exec is stateful so lastIndex has to be reset each time
+  }
 
 
   labelPattern.lastIndex = 0;
@@ -767,7 +769,7 @@ function getRegisteredStyles(registered, registeredStyles, classNames) {
   classNames.split(' ').forEach(function (className) {
     if (registered[className] !== undefined) {
       registeredStyles.push(registered[className] + ";");
-    } else if (className) {
+    } else {
       rawClassName += className + " ";
     }
   });
@@ -1976,12 +1978,10 @@ const useFooterStyles = makeStyles()((theme) => ({
 
 const Footer = ({ items, serviceNameText, udirLink, udirLogo, }) => {
     const { classes } = useFooterStyles();
-    const renderItem = (item) => item.onClickItem ? (React__default.createElement(Button, { className: classes.itemBtn.concat(' ' + classes.itemText), onClick: item.onClickItem }, item.label)) : (React__default.createElement(ListItemText, { className: classes.itemText, primary: item.label, slotProps: {
-            primary: {
-                style: { fontSize: 14, fontFamily: 'Montserrat', fontWeight: 400 },
-            },
+    const renderItem = (item) => item.onClickItem ? (React__default.createElement(Button, { className: classes.itemBtn.concat(' ' + classes.itemText), onClick: item.onClickItem }, item.label)) : (React__default.createElement(ListItemText, { className: classes.itemText, primary: item.label, primaryTypographyProps: {
+            style: { fontSize: 14, fontFamily: 'Montserrat', fontWeight: 400 },
         } }));
-    return (React__default.createElement("footer", { className: classes.footer },
+    return (React__default.createElement(Box, { className: classes.footer, role: "contentinfo" },
         React__default.createElement(Box, { className: classes.content },
             React__default.createElement("a", { href: udirLink },
                 React__default.createElement("img", { src: udirLogo, alt: "Utdanningsdirektoratet logo", style: { height: '43px', width: '150px' } })),
@@ -1991,8 +1991,9 @@ const Footer = ({ items, serviceNameText, udirLink, udirLogo, }) => {
                     paddingRight: '16px !important',
                 } },
                 React__default.createElement("span", { className: classes.serviceNameText }, serviceNameText),
-                React__default.createElement(List, { className: classes.list }, items.map((item, i) => (React__default.createElement(ListItem, { key: i + item.label, classes: {
+                React__default.createElement(List, { className: classes.list }, items.map((item, i) => (React__default.createElement(ListItem, { key: i, classes: {
                         root: classes.item,
+                        //button: onClickItem ? classes.itemBtn : undefined,
                     } }, item.render
                     ? item.render(() => renderItem(item))
                     : renderItem(item)))))))));
@@ -2002,11 +2003,9 @@ const LinkList = (props) => (React__default.createElement(Box$1, { width: "100%"
     React__default.createElement(Typography$1, { style: { fontSize: 24, color: Colors.black, marginBottom: 20 } }, props.title),
     React__default.createElement(List$1, null, props.pages.map((page) => (React__default.createElement(Box$1, { key: page.id },
         React__default.createElement(ListItemButton, { onClick: () => props.onPageClick(page), style: { padding: '12px 4px' } },
-            React__default.createElement(ListItemText$1, { primary: page.label, slotProps: {
-                    primary: {
-                        color: 'primary',
-                        style: { fontSize: 18 },
-                    }
+            React__default.createElement(ListItemText$1, { primary: page.label, primaryTypographyProps: {
+                    color: 'primary',
+                    style: { fontSize: 18 },
                 } }),
             React__default.createElement(ListItemIcon, { style: { justifyContent: 'flex-end' } },
                 React__default.createElement(ArrowForward, { color: "primary" }))),
@@ -2191,15 +2190,13 @@ const PaginationActions = ({ count, page, rowsPerPage, onPageChange }) => {
 
 const GrepTablePagination = (props) => {
     const { classes } = usePaginationStyles();
-    return (React__default.createElement(TablePagination, { classes: classes, rowsPerPageOptions: props.rowsPerPageOptions, slotProps: {
-            select: {
-                inputProps: {
-                    title: 'Velg antall elementer',
-                },
-                style: {
-                    gridArea: 'left',
-                    justifySelf: 'start',
-                },
+    return (React__default.createElement(TablePagination, { classes: classes, rowsPerPageOptions: props.rowsPerPageOptions, SelectProps: {
+            inputProps: {
+                title: 'Velg antall elementer',
+            },
+            style: {
+                gridArea: 'left',
+                justifySelf: 'start',
             },
         }, ActionsComponent: (actions) => (React__default.createElement(PaginationActions, { ...actions })), ...props }));
 };
@@ -2526,7 +2523,7 @@ const useStyles$a = makeStyles()({
 
 const SearchBar = (props) => {
     const inputRef = React.useRef(null);
-    const [value, setValue] = React.useState(props.initValue ?? '');
+    const [value, setValue] = React.useState(props.initValue || '');
     const { classes } = useStyles$a();
     React.useEffect(() => {
         if (props.autoFocus && inputRef.current) {
@@ -2548,16 +2545,14 @@ const SearchBar = (props) => {
             } },
             React.createElement(Box, { className: classes.icon },
                 React.createElement(Search, null)),
-            React.createElement(TextField, { id: props.id, role: "search", className: classes.input, value: value, variant: "standard", inputRef: inputRef, onChange: _handleChange, autoFocus: props.autoFocus, placeholder: props.placeholder, slotProps: {
-                    input: {
-                        disableUnderline: true,
-                        fullWidth: true,
-                        inputProps: {
-                            title: props.title,
-                        },
+            React.createElement(TextField, { id: props.id, role: "search", className: classes.input, value: value, variant: "standard", inputRef: inputRef, onChange: _handleChange, autoFocus: props.autoFocus, placeholder: props.placeholder, InputProps: {
+                    disableUnderline: true,
+                    fullWidth: true,
+                    inputProps: {
+                        title: props.title,
                     },
                 } }),
-            React.createElement(Box, { className: classes.icon, style: { cursor: 'pointer' } }, !!value.length && (React.createElement(Close, { "data-testid": "searchBarClearBtn", tabIndex: 0, onClick: _handleClear, onKeyDown: keyboard.onActivation(_handleClear) })))),
+            React.createElement(Box, { className: classes.icon, style: { cursor: 'pointer' } }, !!value.length && (React.createElement(Close, { "data-testid": "searchBarClearBtn", tabIndex: 0, onClick: _handleClear, onKeyPress: keyboard.onActivation(_handleClear) })))),
         React.createElement("div", { style: { display: 'flex', alignItems: 'center' } },
             props.helpText && (React.createElement(Typography, { className: classes.helptext }, props.helpText)),
             props.searchAllText && props.onSearchAll && (React.createElement(Button, { color: "primary", onClick: props.onSearchAll }, props.searchAllText)))));
@@ -2596,9 +2591,7 @@ const useStyles$8 = makeStyles()((theme) => ({
     },
 }));
 
-const renderField$1 = (id, label, value) => (React.createElement(TextField, { id: id, disabled: true, label: label, value: value, variant: "outlined", style: { margin: '10px 0' }, slotProps: {
-        input: { style: { color: 'rgb(84, 84, 84)' } }
-    } }));
+const renderField$1 = (id, label, value) => (React.createElement(TextField, { id: id, disabled: true, label: label, value: value, variant: "outlined", style: { margin: '10px 0' }, InputProps: { style: { color: 'rgb(84, 84, 84)' } } }));
 const ProfileInfo = (props) => {
     const { classes } = useStyles$8();
     return (React.createElement(Box, { className: classes.container },
@@ -2656,9 +2649,7 @@ const GDPR = ({ children }) => {
 const GrepInput = ({ variant = 'standard', ...props }) => {
     const { errorMessage, helperText, shrink, value, ...rest } = props;
     const error = errorMessage ? errorMessage.length > 0 : false;
-    return (React.createElement(TextField, { ...rest, variant: variant, helperText: errorMessage ?? helperText, value: value === null ? '' : value, error: error || rest.error, slotProps: {
-            inputLabel: { shrink },
-        } }));
+    return (React.createElement(TextField, { ...rest, variant: variant, helperText: errorMessage || helperText, value: value === null ? '' : value, InputLabelProps: { shrink }, error: error || rest.error }));
 };
 
 const GrepSelect = (props) => {
@@ -3220,10 +3211,10 @@ const GrepDateRange = ({ onChange, spacing = 3, style, fullWidth, from: fromProp
     const [to, setTo] = useDate(toProperties.value);
     const { minDate, maxDate, ...commonProperties } = properties;
     useEffect(() => onChange(new DateRangeValue(from, to)), [String(from), String(to)]);
-    return (React__default.createElement(Grid2, { container: true, spacing: spacing, style: style },
-        React__default.createElement(Grid2, { size: { xs: 12, sm: fullWidth ? 12 : 6 } },
+    return (React__default.createElement(Grid, { container: true, spacing: spacing, style: style },
+        React__default.createElement(Grid, { item: true, xs: 12, sm: fullWidth ? 12 : 6 },
             React__default.createElement(DatePicker, { id: String(fromProperties.label), fullWidth: true, minDate: minDate, ...commonProperties, ...fromProperties, value: from, maxDate: to?.subtract(1, 'day') || undefined, onChange: setFrom })),
-        React__default.createElement(Grid2, { size: { xs: 12, sm: fullWidth ? 12 : 6 } },
+        React__default.createElement(Grid, { item: true, xs: 12, sm: fullWidth ? 12 : 6 },
             React__default.createElement(DatePicker, { id: String(toProperties.label), fullWidth: true, maxDate: maxDate, ...commonProperties, ...toProperties, value: to, minDate: from?.add(1, 'day') || undefined, onChange: setTo }))));
 };
 
@@ -15719,7 +15710,7 @@ const ConfirmationDialog = ({ open, title, description, warning, onSubmit, onCan
         React__default.createElement(DialogContent$1, null,
             React__default.createElement(DialogContentText$1, null, description)),
         React__default.createElement(DialogActions$1, null,
-            React__default.createElement(Button, { color: "primary", onClick: onCancel }, cancelText),
+            React__default.createElement(Button, { color: "inherit", onClick: onCancel }, cancelText),
             React__default.createElement(Button, { className: warning ? classes.discard : '', onClick: onSubmit }, confirmText))));
 };