react-admin-base-bootstrap 0.8.18 → 0.8.20

package/lib/esm/Components/ApiSelect.d.ts

@@ -1,5 +1,3 @@
-/** @jsx jsx */
-import { jsx } from '@emotion/react';
 import React from 'react';
 export interface ApiSelectProps<Option = any> {
     url?: string;
@@ -19,8 +17,8 @@ export interface ApiSelectProps<Option = any> {
     onAddOrEdit?: (item: any) => void;
     getNewOptionData?: (name: string, elem: React.ReactNode) => any | null;
 }
-export default function ApiSelect<Option = any>(props: ApiSelectProps<Option>): jsx.JSX.Element;
+export default function ApiSelect<Option = any>(props: ApiSelectProps<Option>): React.JSX.Element;
 export interface CreateSelectProps<Option = any> extends ApiSelectProps<Option> {
     Component: any;
 }
-export declare function CreateSelect(props: CreateSelectProps): jsx.JSX.Element;
+export declare function CreateSelect(props: CreateSelectProps): React.JSX.Element;

package/lib/esm/Components/ApiSelect.js

@@ -7,25 +7,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-/** @jsx jsx */
-import { jsx } from '@emotion/react';
 import React, { Fragment, useCallback, useMemo, useState } from 'react';
 import { RefreshScope, useFetch, useRefresh } from 'react-admin-base';
 import { FormattedMessage, useIntl } from 'react-intl';
 import Select, { components } from "react-select";
 import CreatableSelect from 'react-select/creatable';
 function Option(props) {
-    return jsx(components.Option, Object.assign({}, props), (props.selectProps.children && props.selectProps.children(props.data)) || (props.data.__isNew__ ? jsx(FormattedMessage, { id: "CREATE_VALUE", values: { text: props.children } }) : props.children));
+    return React.createElement(components.Option, Object.assign({}, props), (props.selectProps.children && props.selectProps.children(props.data)) || (props.data.__isNew__ ? React.createElement(FormattedMessage, { id: "CREATE_VALUE", values: { text: props.children } }) : props.children));
 }
 function SingleValue(props) {
-    return jsx(components.SingleValue, Object.assign({}, props), (props.selectProps.children && props.selectProps.children(props.data)) || (props.data.__isNew__ ? jsx(FormattedMessage, { id: "CREATE_VALUE", values: { text: props.children } }) : props.children));
+    return React.createElement(components.SingleValue, Object.assign({}, props), (props.selectProps.children && props.selectProps.children(props.data)) || (props.data.__isNew__ ? React.createElement(FormattedMessage, { id: "CREATE_VALUE", values: { text: props.children } }) : props.children));
 }
 function MultiValue(props) {
-    return jsx(components.MultiValue, Object.assign({}, props), (props.selectProps.children && props.selectProps.children(props.data)) || props.children);
+    return React.createElement(components.MultiValue, Object.assign({}, props), (props.selectProps.children && props.selectProps.children(props.data)) || props.children);
 }
 function EditOrAddIndicator(props) {
     const { className, cx, getStyles, innerProps, isMulti } = props;
-    return (jsx("div", Object.assign({}, innerProps, { className: cx({
+    return (React.createElement("div", Object.assign({}, innerProps, { className: cx({
             indicator: true,
             'clear-indicator': true
         }, className), css: getStyles('clearIndicator', props), onMouseDown: e => {
@@ -33,20 +31,20 @@ function EditOrAddIndicator(props) {
             e.preventDefault();
             props.selectProps.onAddOrEdit();
         } }),
-        jsx("i", { className: "fas " + (props.hasValue && !isMulti ? 'fa-pencil-alt' : 'fa-plus') })));
+        React.createElement("i", { className: "fas " + (props.hasValue && !isMulti ? 'fa-pencil-alt' : 'fa-plus') })));
 }
 function IndicatorsContainer(props) {
-    return jsx(components.IndicatorsContainer, Object.assign({}, props),
-        props.selectProps.onAddOrEdit && jsx(React.Fragment, null,
-            jsx(EditOrAddIndicator, Object.assign({}, props)),
-            jsx(components.IndicatorSeparator, Object.assign({}, props))),
+    return React.createElement(components.IndicatorsContainer, Object.assign({}, props),
+        props.selectProps.onAddOrEdit && React.createElement(React.Fragment, null,
+            React.createElement(EditOrAddIndicator, Object.assign({}, props)),
+            React.createElement(components.IndicatorSeparator, Object.assign({}, props))),
         props.children);
 }
 function MultiValueRemove(props) {
-    return jsx(Fragment, null,
-        props.selectProps.onAddOrEdit && jsx(components.MultiValueRemove, Object.assign({}, props, { innerProps: Object.assign(Object.assign({}, props.innerProps), { onClick: () => props.selectProps.onAddOrEdit(props.data) }) }),
-            jsx("i", { className: "fas fa-pencil", style: { fontSize: '.75em' } })),
-        jsx(components.MultiValueRemove, Object.assign({}, props)));
+    return React.createElement(Fragment, null,
+        props.selectProps.onAddOrEdit && React.createElement(components.MultiValueRemove, Object.assign({}, props, { innerProps: Object.assign(Object.assign({}, props.innerProps), { onClick: () => props.selectProps.onAddOrEdit(props.data) }) }),
+            React.createElement("i", { className: "fas fa-pencil", style: { fontSize: '.75em' } })),
+        React.createElement(components.MultiValueRemove, Object.assign({}, props)));
 }
 const Components = { Option, SingleValue, MultiValue, IndicatorsContainer, MultiValueRemove };
 export default function ApiSelect(props) {
@@ -89,8 +87,8 @@ export default function ApiSelect(props) {
         setIsMenuOpen(false);
     }, [setIsMenuOpen]);
     const Component = onCreateOption ? CreatableSelect : Select;
-    return jsx(RefreshScope, { update: update },
-        jsx(Component, Object.assign({}, props, { className: 'react-select-container', classNamePrefix: "react-select", onCreateOption: onCreateOption && handleCreateOption, getNewOptionData: (onCreateOption && (getNewOptionData || ((inputValue) => ({ [nameKey || 'name']: inputValue, __isNew__: true })))) || undefined, inputValue: search, onInputChange: a => setSearch(a), components: Components, isLoading: !!loading || creating, getOptionLabel: getOptionLabel || ((row) => row[nameKey || 'name']), getOptionValue: getOptionValue || ((row) => row[idKey || 'id']), isDisabled: !!disabled || creating, isClearable: true, isSearchable: true, placeholder: placeholder || intl.formatMessage({ id: 'SELECT' }), options: !options ? [] : ((filter && options.filter(filter)) || options), onMenuOpen: onMenuOpen, onMenuClose: onMenuClose })));
+    return React.createElement(RefreshScope, { update: update },
+        React.createElement(Component, Object.assign({}, props, { className: 'react-select-container', classNamePrefix: "react-select", onCreateOption: onCreateOption && handleCreateOption, getNewOptionData: (onCreateOption && (getNewOptionData || ((inputValue) => ({ [nameKey || 'name']: inputValue, __isNew__: true })))) || undefined, inputValue: search, onInputChange: a => setSearch(a), components: Components, isLoading: !!loading || creating, getOptionLabel: getOptionLabel || ((row) => row[nameKey || 'name']), getOptionValue: getOptionValue || ((row) => row[idKey || 'id']), isDisabled: !!disabled || creating, isClearable: true, isSearchable: true, placeholder: placeholder || intl.formatMessage({ id: 'SELECT' }), options: !options ? [] : ((filter && options.filter(filter)) || options), onMenuOpen: onMenuOpen, onMenuClose: onMenuClose })));
 }
 export function CreateSelect(props) {
     const { Component, onChange, value, isMulti, idKey } = props;
@@ -102,7 +100,7 @@ export function CreateSelect(props) {
         data && onChange(isMulti ? isOpenId ? value.map(b => b.id === isOpenId ? data : b) : (value || []).concat([data]) : data);
         update && update();
     }, [value, onChange, isMulti, isOpenId, isOpen, update, setIsOpen]);
-    return jsx(Fragment, null,
-        isOpen && jsx(Component, { id: isOpenId || (!isMulti && value && value[idKey || "id"]), onReload: onReload }),
-        jsx(ApiSelect, Object.assign({}, props, { onAddOrEdit: item => setIsOpen(item || true) })));
+    return React.createElement(Fragment, null,
+        isOpen && React.createElement(Component, { id: isOpenId || (!isMulti && value && value[idKey || "id"]), onReload: onReload }),
+        React.createElement(ApiSelect, Object.assign({}, props, { onAddOrEdit: item => setIsOpen(item || true) })));
 }

package/lib/esm/Components/CRUD.js

@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import React, { useCallback, useContext, useRef, useState } from 'react';
 import { ValidatorProvider } from "react-admin-base";
-import { FormattedMessage, useIntl } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 import { Navigate, Routes, useParams, Route } from 'react-router-dom';
 import { Alert, Button, Col, Form, ModalFooter, ModalHeader, Row } from "reactstrap";
 import LoadingButton from '../Components/LoadingButton';
@@ -28,7 +28,7 @@ import BootstrapDataTable, { Actions } from './BootstrapDataTable';
 import BootstrapModal from './BootstrapModal';
 import { useBootstrapOptions } from "./BootstrapOptions";
 export function ModalEntityEditor({ entity, title, size, url, onReload, disabled, children }) {
-    const [, , save, loading, dirty] = entity;
+    const [data, , save, loading, dirty] = entity;
     const bsOptions = useBootstrapOptions();
     const [open, setOpen] = useState(true);
     const [saved, setSaved] = useState(false);
@@ -60,26 +60,11 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
             }
         });
     }, [save, saved, error, onReload, url]);
-    const check = bsOptions.noCloseOnSave && dirty;
-    const intl = useIntl();
-    const checkConfirmText = intl.formatMessage({ id: 'CANCEL_ENTITY_SAVE' });
-    const onClose = useCallback(function () {
-        if (check) {
-            const ok = confirm(checkConfirmText);
-            if (!ok)
-                return;
-        }
-        if (url) {
-            setOpen(false);
-        }
-        else {
-            onReload(null);
-        }
-    }, [setOpen, onReload, url, check, checkConfirmText]);
     return React.createElement(React.Fragment, null,
         ((!bsOptions.noCloseOnSave && saved) || !open) && url && React.createElement(Navigate, { to: url, replace: true }),
-        React.createElement(BootstrapModal, { isOpen: true, size: size, toggle: onClose, fade: false },
-            title && React.createElement(ModalHeader, { toggle: onClose },
+        ((bsOptions.noCloseOnSave && saved) || !open) && url && React.createElement(Navigate, { to: url + "/" + data.id + "/edit", replace: true }),
+        React.createElement(BootstrapModal, { isOpen: true, size: size, toggle: () => url ? setOpen(false) : onReload(null), fade: false },
+            title && React.createElement(ModalHeader, { toggle: () => url ? setOpen(false) : onReload(null) },
                 React.createElement("b", null, title)),
             React.createElement(ValidatorProvider, null,
                 React.createElement(Form, { onSubmit: onSubmit, disabled: !!loading || disabled },
@@ -97,7 +82,7 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
                                     ' ',
                                     React.createElement(FormattedMessage, { id: "ENTITY.SAVE" }))),
                             React.createElement(Col, null,
-                                React.createElement(Button, { block: true, outline: true, color: "danger", onClick: (e) => { e.preventDefault(); onClose(); } },
+                                React.createElement(Button, { block: true, outline: true, color: "danger", onClick: (e) => { e.preventDefault(); (url ? setOpen(false) : onReload(null)); } },
                                     React.createElement("i", { className: "fas fa-times-circle" }),
                                     ' ',
                                     React.createElement(FormattedMessage, { id: "ENTITY.CANCEL" })))))))));

package/lib/esm/i18n/de.json

@@ -38,6 +38,5 @@
     "ACTIONS.DELETE.CONFIRM": "Ja, löschen!",
     "PLEASE_WAIT": "Warten Sie mal.",
     "AUTHORIZATION_CODE": "Zugangscode",
-    "RECORDS": "{count, plural, =0 {kein eintrag} one {# datensatz} other {# datensätze}}",
-    "CANCEL_ENTITY_SAVE": "Es gibt Änderungen auf der Seite. Sind Sie sicher, dass Sie sie rückgängig machen wollen?"
+    "RECORDS": "{count, plural, =0 {kein eintrag} one {# datensatz} other {# datensätze}}"
 }

package/lib/esm/i18n/en.json

@@ -40,6 +40,5 @@
     "ACTIONS.DELETE.CONFIRM": "Yes, delete it!",
     "PLEASE_WAIT": "Please wait.",
     "AUTHORIZATION_CODE": "Authorization Code",
-    "RECORDS": "{count, plural, =0 {no records} one {# record} other {# records}}",
-    "CANCEL_ENTITY_SAVE": "There are changes on the page. Are you sure you want to undo them?"
+    "RECORDS": "{count, plural, =0 {no records} one {# record} other {# records}}"
 }

package/lib/esm/i18n/tr.json

@@ -39,6 +39,5 @@
     "ACTIONS.DELETE.CONFIRM": "Evet, sil!",
     "PLEASE_WAIT": "Lütfen bekleyiniz.",
     "AUTHORIZATION_CODE": "Yetki Kodu",
-    "RECORDS": "{count, plural, =0 {Kayıt yok} one {# kayıt} other {# kayıt}}",
-    "CANCEL_ENTITY_SAVE": "Sayfada değişiklikler var. Geri almak istediğinizden emin misiniz?"
+    "RECORDS": "{count, plural, =0 {Kayıt yok} one {# kayıt} other {# kayıt}}"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-admin-base-bootstrap",
-  "version": "0.8.18",
+  "version": "0.8.20",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -28,7 +28,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-intl": "^6.2.10",
-    "react-router-dom": "^6.13.0"
+    "react-router-dom": "^6.18.0"
   },
   "dependencies": {
     "@emotion/react": "^11.11.1",

package/src/Components/ApiSelect.tsx

@@ -1,4 +1,3 @@
-/** @jsx jsx */
 import { jsx } from '@emotion/react';
 import React, {Fragment, useCallback, useMemo, useState} from 'react';
 import {RefreshScope, useFetch, useRefresh} from 'react-admin-base';

package/src/Components/CRUD.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useRef, useState } from 'react';
 import { ValidatorProvider } from "react-admin-base";
-import {FormattedMessage, useIntl} from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 import { Navigate, Routes, useParams, Route } from 'react-router-dom';
 import { Alert, Button, Col, Form, Modal, ModalFooter, ModalHeader, Row } from "reactstrap";
 import LoadingButton from '../Components/LoadingButton';
@@ -19,7 +19,7 @@ type ModalEntityEditorParams = {
 }
 
 export function ModalEntityEditor({ entity, title, size, url, onReload, disabled, children } : ModalEntityEditorParams) {
-    const [ , , save, loading, dirty ] = entity;
+    const [ data, , save, loading, dirty ] = entity;
     const bsOptions = useBootstrapOptions();
 
     const [ open, setOpen ] = useState(true);
@@ -58,27 +58,11 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
         }
     }, [save, saved, error, onReload, url]);
 
-    const check = bsOptions.noCloseOnSave && dirty;
-    const intl = useIntl();
-    const checkConfirmText = intl.formatMessage({ id: 'CANCEL_ENTITY_SAVE' });
-    const onClose = useCallback(function() {
-        if (check) {
-            const ok = confirm(checkConfirmText);
-            if (!ok)
-                return ;
-        }
-
-        if (url) {
-            setOpen(false);
-        } else {
-            onReload(null);
-        }
-    }, [ setOpen, onReload, url, check, checkConfirmText ]);
-
     return <>
         { ((!bsOptions.noCloseOnSave && saved) || !open) && url && <Navigate to={url} replace />}
-        <BootstrapModal isOpen size={size} toggle={onClose} fade={false}>
-            { title && <ModalHeader toggle={onClose}>
+        { ((bsOptions.noCloseOnSave && saved) || !open) && url && <Navigate to={url + "/" + data.id + "/edit"} replace />}
+        <BootstrapModal isOpen size={size} toggle={() => url ? setOpen(false) : onReload(null)} fade={false}>
+            { title && <ModalHeader toggle={() => url ? setOpen(false) : onReload(null)}>
                 <b>{ title }</b>
             </ModalHeader> }
             <ValidatorProvider>
@@ -96,7 +80,7 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
                             </LoadingButton>
                         </Col>
                         <Col>
-                          <Button block outline color="danger" onClick={(e) => { e.preventDefault(); onClose(); }}>
+                          <Button block outline color="danger" onClick={(e) => { e.preventDefault(); (url ? setOpen(false) : onReload(null)); }}>
                               <i className="fas fa-times-circle" />{' '}<FormattedMessage id="ENTITY.CANCEL" />
                           </Button>
                         </Col>

package/src/i18n/de.json

@@ -38,6 +38,5 @@
   "ACTIONS.DELETE.CONFIRM": "Ja, löschen!",
   "PLEASE_WAIT": "Warten Sie mal.",
   "AUTHORIZATION_CODE": "Zugangscode",
-  "RECORDS": "{count, plural, =0 {kein eintrag} one {# datensatz} other {# datensätze}}",
-  "CANCEL_ENTITY_SAVE": "Es gibt Änderungen auf der Seite. Sind Sie sicher, dass Sie sie rückgängig machen wollen?"
+  "RECORDS": "{count, plural, =0 {kein eintrag} one {# datensatz} other {# datensätze}}"
 }

package/src/i18n/en.json

@@ -40,6 +40,5 @@
   "ACTIONS.DELETE.CONFIRM": "Yes, delete it!",
   "PLEASE_WAIT": "Please wait.",
   "AUTHORIZATION_CODE": "Authorization Code",
-  "RECORDS": "{count, plural, =0 {no records} one {# record} other {# records}}",
-  "CANCEL_ENTITY_SAVE": "There are changes on the page. Are you sure you want to undo them?"
+  "RECORDS": "{count, plural, =0 {no records} one {# record} other {# records}}"
 }

package/src/i18n/tr.json

@@ -39,6 +39,5 @@
   "ACTIONS.DELETE.CONFIRM": "Evet, sil!",
   "PLEASE_WAIT": "Lütfen bekleyiniz.",
   "AUTHORIZATION_CODE": "Yetki Kodu",
-  "RECORDS": "{count, plural, =0 {Kayıt yok} one {# kayıt} other {# kayıt}}",
-  "CANCEL_ENTITY_SAVE": "Sayfada değişiklikler var. Geri almak istediğinizden emin misiniz?"
+  "RECORDS": "{count, plural, =0 {Kayıt yok} one {# kayıt} other {# kayıt}}"
 }

package/lib/esm/Components/DragDrop.d.ts

@@ -1,2 +0,0 @@
-import { ButtonProps } from "reactstrap";
-export declare function DragAndDropArrow(props: ButtonProps): JSX.Element | null;

package/lib/esm/Components/DragDrop.js

@@ -1,11 +0,0 @@
-import React from "react";
-import { Button } from "reactstrap";
-import { useDragContext } from "react-admin-base";
-export function DragAndDropArrow(props) {
-    const [ref, isDragging] = useDragContext();
-    if (!ref)
-        return null;
-    return React.createElement(Button, Object.assign({ type: "button", innerRef: ref, outline: true, size: "sm", color: "primary" }, props),
-        React.createElement("i", { className: "fas fa-arrows-up-down-left-right" }),
-        props.children);
-}

package/lib/esm/Components/RichTextEditor.d.ts

@@ -1,4 +0,0 @@
-export default function RichTextEditor({ value, onChange }: {
-    value: any;
-    onChange: any;
-}): JSX.Element;

package/lib/esm/Components/RichTextEditor.js

@@ -1,52 +0,0 @@
-import React from 'react';
-import { LexicalComposer } from "@lexical/react/LexicalComposer";
-import { RichTextPlugin } from "@lexical/react/LexicalRichTextPlugin";
-import { ContentEditable } from "@lexical/react/LexicalContentEditable";
-import { HistoryPlugin } from "@lexical/react/LexicalHistoryPlugin";
-import { AutoFocusPlugin } from "@lexical/react/LexicalAutoFocusPlugin";
-import { HeadingNode, QuoteNode } from "@lexical/rich-text";
-import { TableCellNode, TableNode, TableRowNode } from "@lexical/table";
-import { ListItemNode, ListNode } from "@lexical/list";
-import { CodeHighlightNode, CodeNode } from "@lexical/code";
-import { AutoLinkNode, LinkNode } from "@lexical/link";
-import { LinkPlugin } from "@lexical/react/LexicalLinkPlugin";
-import { ListPlugin } from "@lexical/react/LexicalListPlugin";
-import { MarkdownShortcutPlugin } from "@lexical/react/LexicalMarkdownShortcutPlugin";
-import { TRANSFORMERS } from "@lexical/markdown";
-import ToolbarPlugin from '../Lexical/ToolbarPlugin';
-function Placeholder() {
-    return React.createElement("div", { className: "editor-placeholder" }, "Enter some rich text...");
-}
-const editorConfig = {
-    namespace: '',
-    // Handling of errors during update
-    onError(error) {
-        throw error;
-    },
-    // Any custom nodes go here
-    nodes: [
-        HeadingNode,
-        ListNode,
-        ListItemNode,
-        QuoteNode,
-        CodeNode,
-        CodeHighlightNode,
-        TableNode,
-        TableCellNode,
-        TableRowNode,
-        AutoLinkNode,
-        LinkNode
-    ]
-};
-export default function RichTextEditor({ value, onChange }) {
-    return React.createElement(LexicalComposer, { initialConfig: editorConfig },
-        React.createElement("div", { className: "editor-container" },
-            React.createElement(ToolbarPlugin, null),
-            React.createElement("div", { className: "editor-inner" },
-                React.createElement(RichTextPlugin, { contentEditable: React.createElement(ContentEditable, { className: "editor-input" }), placeholder: React.createElement(Placeholder, null) }),
-                React.createElement(HistoryPlugin, null),
-                React.createElement(AutoFocusPlugin, null),
-                React.createElement(ListPlugin, null),
-                React.createElement(LinkPlugin, null),
-                React.createElement(MarkdownShortcutPlugin, { transformers: TRANSFORMERS }))));
-}