react-admin-base-bootstrap 0.8.10 → 0.8.12

package/lib/esm/Components/ApiSelect.js

@@ -20,6 +20,9 @@ function Option(props) {
 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));
 }
+function MultiValue(props) {
+    return jsx(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({
@@ -45,7 +48,7 @@ function MultiValueRemove(props) {
             jsx("i", { className: "fas fa-pencil", style: { fontSize: '.75em' } })),
         jsx(components.MultiValueRemove, Object.assign({}, props)));
 }
-const Components = { Option, SingleValue, IndicatorsContainer, MultiValueRemove };
+const Components = { Option, SingleValue, MultiValue, IndicatorsContainer, MultiValueRemove };
 export default function ApiSelect(props) {
     const { disabled, url, getOptionLabel, getOptionValue, idKey, nameKey, filter, group, onCreateOption, getNewOptionData, isMulti, onChange, value, placeholder, staticOptions } = props;
     const intl = useIntl();
@@ -93,13 +96,13 @@ export function CreateSelect(props) {
     const { Component, onChange, value, isMulti, idKey } = props;
     const update = useRefresh();
     const [isOpen, setIsOpen] = useState(false);
-    const isOpenId = isOpen && isOpen[idKey || "id"];
+    const isOpenId = isOpen === true ? null : isOpen && isOpen[idKey || "id"];
     const onReload = useCallback(function (data) {
         setIsOpen(false);
         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"]), onReload: onReload }),
+        isOpen && jsx(Component, { id: isOpenId || (!isMulti && value && value[idKey || "id"]), onReload: onReload }),
         jsx(ApiSelect, Object.assign({}, props, { onAddOrEdit: item => setIsOpen(item || true) })));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-admin-base-bootstrap",
-  "version": "0.8.10",
+  "version": "0.8.12",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -38,7 +38,7 @@
     "modal-cropper": "^1.2.3",
     "nprogress": "^0.2.0",
     "prettysize": "^2.0.0",
-    "react-admin-base": "^0.8.4",
+    "react-admin-base": "^0.8.5",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-password-strength-bar": "^0.4.1",

package/src/Components/ApiSelect.tsx

@@ -24,6 +24,12 @@ function SingleValue(props) {
     </components.SingleValue>
 }
 
+function MultiValue(props) {
+    return <components.MultiValue {...props}>
+        { (props.selectProps.children && props.selectProps.children(props.data)) || props.children }
+    </components.MultiValue>
+}
+
 function EditOrAddIndicator(props) {
     const { className, cx, getStyles, innerProps, isMulti } = props;
     return (
@@ -66,7 +72,7 @@ function MultiValueRemove(props) {
     </Fragment>;
 }
 
-const Components = { Option, SingleValue, IndicatorsContainer, MultiValueRemove };
+const Components = { Option, SingleValue, MultiValue, IndicatorsContainer, MultiValueRemove };
 
 export interface ApiSelectProps<Option = any> {
     url?: string;
@@ -163,7 +169,7 @@ export function CreateSelect(props: CreateSelectProps) {
 
     const update = useRefresh();
     const [ isOpen, setIsOpen ] = useState<any>(false);
-    const isOpenId = isOpen && isOpen[idKey || "id"];
+    const isOpenId = isOpen === true ? null : isOpen && isOpen[idKey || "id"];
 
     const onReload = useCallback(function(data) {
         setIsOpen(false);
@@ -172,7 +178,7 @@ export function CreateSelect(props: CreateSelectProps) {
         }, [value, onChange, isMulti, isOpenId, isOpen, update, setIsOpen]);
 
     return <Fragment>
-        { isOpen && <Component id={isOpenId || (!isMulti && value && value["idKey"])} onReload={onReload} /> }
+        { isOpen && <Component id={isOpenId || (!isMulti && value && value[idKey || "id"])} onReload={onReload} /> }
         <ApiSelect {...props} onAddOrEdit={item => setIsOpen(item || true)} />
     </Fragment>;
 }