ish-ui 1.0.35 → 1.0.37

package/dist/formFields/FormRadioButtons.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
-declare const _default: React.FunctionComponent<any>;
-export default _default;
+import { RadioButtonsProps } from '../model';
+declare function FormRadioButtons({ items, disabled, input: { value, onChange, name }, meta: { invalid, error }, labelPath, valuePath, color, row, label, labelClass, labelAdornment, radioProps, radioGroupProps }: RadioButtonsProps): React.JSX.Element;
+export default FormRadioButtons;

package/dist/formFields/FormRadioButtons.js

@@ -6,22 +6,24 @@
  *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
  */
 import React from 'react';
-import { withStyles } from '@mui/styles';
-import { FormControl, FormControlLabel, Radio, RadioGroup } from '@mui/material';
+import { FormControl, FormControlLabel, FormHelperText, InputLabel, Radio, RadioGroup, } from '@mui/material';
 import Typography from '@mui/material/Typography';
-const styles = theme => ({
-    root: {
-        display: 'flex'
-    },
+import { makeAppStyles } from '../styles';
+const useStyles = makeAppStyles(theme => ({
     group: {
         margin: theme.spacing(1, 0)
     }
-});
-const FormRadioButtons = props => {
-    const { classes, items, disabled, input: { value, onChange, name }, labelPath = 'label', valuePath = 'value', color = 'primary', row } = props;
-    return (React.createElement("div", { className: classes.root },
-        React.createElement(FormControl, { component: "fieldset" },
-            React.createElement(RadioGroup, { className: classes.group, value: value, onChange: (e) => onChange(e.target.value), row: row }, items
-                && items.map((i, n) => (React.createElement(FormControlLabel, { key: n, value: i[valuePath], control: React.createElement(Radio, { color: color, id: `input-${n}-${name}`, name: name }), label: (React.createElement(Typography, { component: "span", variant: "body2" }, i[labelPath])), disabled: disabled, htmlFor: `input-${n}-${name}` })))))));
-};
-export default withStyles(styles)(FormRadioButtons);
+}));
+function FormRadioButtons({ items, disabled, input: { value, onChange, name }, meta: { invalid, error }, labelPath = 'label', valuePath = 'value', color = 'primary', row, label, labelClass, labelAdornment, radioProps, radioGroupProps }) {
+    const classes = useStyles();
+    return (React.createElement(FormControl, { component: "fieldset", error: invalid },
+        label && (React.createElement(InputLabel, { shrink: true, htmlFor: `input-${name}`, className: labelClass },
+            label,
+            labelAdornment)),
+        React.createElement(RadioGroup, Object.assign({ className: classes.group, value: value, onChange: (e) => onChange(e.target.value), row: row }, radioGroupProps), items
+            && items.map((i, n) => (React.createElement(FormControlLabel, { key: n, value: i[valuePath], control: React.createElement(Radio, Object.assign({ color: color, id: `input-${n}-${name}`, name: name }, radioProps)), label: (React.createElement(Typography, { component: "span", variant: "body2" }, i[labelPath])), disabled: disabled, htmlFor: `input-${n}-${name}` })))),
+        React.createElement(FormHelperText, { classes: {
+                error: 'shakingError'
+            } }, error)));
+}
+export default FormRadioButtons;

package/dist/formFields/SelectCustomComponents.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const selectStyles: (theme: any) => import("@mui/styles").StyleRules<{}, "label" | "inline" | "multiple" | "error" | "root" | "expandIcon" | "menuItem" | "inputWrapper" | "readonly" | "editIcon" | "bottomMargin" | "bottomPadding" | "topMargin" | "editable" | "valid" | "autoWidthSelect" | "emptySelect" | "validUnderline" | "menuItemActive" | "menuList" | "hasPopup" | "hasClear">;
+export declare const selectStyles: (theme: any) => import("@mui/styles").StyleRules<{}, "label" | "error" | "inline" | "multiple" | "root" | "expandIcon" | "menuItem" | "inputWrapper" | "readonly" | "editIcon" | "bottomMargin" | "bottomPadding" | "topMargin" | "editable" | "valid" | "autoWidthSelect" | "emptySelect" | "validUnderline" | "menuItemActive" | "menuList" | "hasPopup" | "hasClear">;
 export declare const ListRow: React.MemoExoticComponent<any>;
 export declare const ListboxComponent: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<any>>;
 export declare const NoWrapOption: (content: any, data: any, search: any, parentProps: any) => React.JSX.Element;

package/dist/formFields/Switch.d.ts

@@ -3,5 +3,5 @@
  * */
 import React from 'react';
 import { FieldInputProps, FormSwitchProps } from '../model';
-export declare const Switch: React.JSXElementConstructor<Omit<any, "classes"> & import("@mui/styles").StyledComponentProps<"default" | "icon" | "bar" | "inline" | "disabled" | "checked" | "root" | "focusVisible">>;
+export declare const Switch: React.JSXElementConstructor<Omit<any, "classes"> & import("@mui/styles").StyledComponentProps<"icon" | "disabled" | "checked" | "default" | "bar" | "inline" | "root" | "focusVisible">>;
 export declare function FormSwitch<InputProps extends FieldInputProps>({ input, color, disabled, stringValue, label, className, inline, onChangeHandler, onClick }: FormSwitchProps<InputProps>): React.JSX.Element;

package/dist/model/Calendar.d.ts

@@ -0,0 +1,5 @@
+export interface CalendarDayModel {
+    day: number;
+    date: Date;
+    status: 'current' | 'previous' | 'next';
+}

package/dist/model/Calendar.js

@@ -0,0 +1,8 @@
+/*
+ * Copyright ish group pty ltd 2023.
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License version 3 as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+ */
+export {};

package/dist/model/Fields.d.ts

@@ -5,6 +5,8 @@ import { AnyArgFunction } from '../model/CommonFunctions';
 import { ShowConfirmCaller } from '../model/Confirm';
 import { PopperPlacementType } from '@mui/material';
 import { FormControlTypeMap } from '@mui/material/FormControl/FormControl';
+import { RadioProps } from '@mui/material/Radio/Radio';
+import { RadioGroupProps } from '@mui/material/RadioGroup/RadioGroup';
 export type EventHandler<Event> = (event: Event, name?: string) => void;
 export interface EventOrValueHandler<Event> extends EventHandler<Event> {
     (value: any): void;
@@ -244,6 +246,23 @@ export interface ColorPickerWrapperProps {
     placement?: PopperPlacementType;
     width?: number;
 }
+export interface RadioButtonsProps<IP = FieldInputProps, MP = FieldMetaProps> {
+    items: Record<any, any>[];
+    input?: Partial<Omit<IP, 'onBlur'>> & {
+        onBlur?: AnyArgFunction;
+    };
+    meta?: Partial<MP>;
+    disabled?: boolean;
+    labelPath?: string;
+    valuePath?: string;
+    row?: boolean;
+    label?: any;
+    labelClass?: string;
+    labelAdornment?: any;
+    color?: RadioProps['color'];
+    radioProps?: RadioProps;
+    radioGroupProps?: RadioGroupProps;
+}
 export type FormFieldProps = ({
     type: 'phone' | 'duration' | 'text' | 'multilineText' | 'password' | 'number' | 'file' | 'money';
 } & FormFieldBaseProps & EditInPlaceFieldProps<FieldInputProps, FieldMetaProps>) | ({
@@ -263,5 +282,7 @@ export type FormFieldProps = ({
 } & FormFieldBaseProps & TagsFieldProps<TagLike, FieldInputProps, FieldMetaProps>) | ({
     type: 'color';
 } & ColorPickerWrapperProps) | ({
+    type: 'radio';
+} & RadioButtonsProps) | ({
     type: 'stub';
 });

package/dist/model/index.d.ts

@@ -5,3 +5,4 @@ export * from './NestedEntity';
 export * from './Theme';
 export * from './CommomObjects';
 export * from './CommonFunctions';
+export * from './Calendar';

package/dist/model/index.js

@@ -12,3 +12,4 @@ export * from './NestedEntity';
 export * from './Theme';
 export * from './CommomObjects';
 export * from './CommonFunctions';
+export * from './Calendar';

package/dist/timetable/miniCalendar/CalendarDay.d.ts

@@ -1,14 +1,11 @@
 import React from 'react';
-import { DateArgFunction } from '../../model';
-interface Props {
-    day: number;
+import { DateArgFunction, CalendarDayModel } from '../../model';
+interface Props extends CalendarDayModel {
+    dayIndexValue: number;
+    isSameAsTarget?: boolean;
+    hasSession?: boolean;
     isToday?: boolean;
-    today?: any;
-    date: Date;
-    status: string;
-    selectedMonthSessionDays: number[];
-    disabled: boolean;
-    theme?: any;
+    disabled?: boolean;
     targetDay?: Date;
     setTargetDay?: DateArgFunction;
     customClasses?: {

package/dist/timetable/miniCalendar/CalendarDay.js

@@ -5,9 +5,8 @@
  *
  *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
  */
-import React, { useMemo, memo } from 'react';
+import React, { memo } from 'react';
 import { Button } from '@mui/material';
-import { isSameDay } from 'date-fns';
 import clsx from 'clsx';
 import { alpha } from '@mui/material/styles';
 import { makeAppStyles } from '../../styles';
@@ -55,13 +54,9 @@ const useStyles = makeAppStyles(theme => ({
     }
 }));
 const CalendarDay = memo((props) => {
-    const { customClasses = {}, day, status, date, disabled, targetDay, setTargetDay, selectedMonthSessionDays } = props;
-    const isSame = isSameDay(targetDay, date);
-    const isToday = isSameDay(new Date(), date);
-    const dayIndexValue = selectedMonthSessionDays[day - 1];
-    const hasSession = useMemo(() => selectedMonthSessionDays.length && status === 'current' && dayIndexValue !== 0, [selectedMonthSessionDays, dayIndexValue, status]);
+    const { customClasses = {}, day, date, setTargetDay, dayIndexValue, hasSession, isSameAsTarget, isToday, disabled } = props;
     const classes = useStyles({ dayIndexValue, hasSession, isToday });
-    return (React.createElement(Button, { className: clsx(classes.root, customClasses.root, isSame && clsx(classes.same, customClasses.selected), {
+    return (React.createElement(Button, { className: clsx(classes.root, customClasses.root, isSameAsTarget && clsx(classes.same, customClasses.selected), {
             [customClasses.hasSession || classes.hasSession]: hasSession,
             [customClasses.today || classes.isToday]: isToday
         }), onClick: () => setTargetDay(date), classes: {

package/dist/utils/dates/timetable.d.ts

@@ -1,5 +1,2 @@
-export declare const getCalendarDays: (date: Date) => {
-    day: number;
-    date: Date;
-    status: any;
-}[];
+import { CalendarDayModel } from '../../model';
+export declare const getCalendarDays: (date: Date) => CalendarDayModel[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ish-ui",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "UI elements for onCourse and other ish apps",
   "main": "main.ts",
   "devDependencies": {