dry-ux 1.32.0 → 1.34.0

package/dist/helpers/DajaxiceProxy.js

@@ -18,7 +18,9 @@ const DajaxiceProxy = ({ modules, authCheck, onError, loader: showLoaderGlobal,
                 return function ({ args, skip, loader: showLoaderLocal, } = {}) {
                     return new Promise((resolve, reject) => {
                         const methodName = window["Dajaxice"][module][method];
-                        const loader = (showLoaderGlobal || showLoaderLocal) && !(skip === null || skip === void 0 ? void 0 : skip.loader) ? new Loader_1.Loader() : undefined;
+                        const loader = (showLoaderGlobal || showLoaderLocal) && !(skip === null || skip === void 0 ? void 0 : skip.loader)
+                            ? Loader_1.Loader.getInstance()
+                            : undefined;
                         const hideLoader = () => {
                             try {
                                 loader === null || loader === void 0 ? void 0 : loader.hide();

package/dist/ui-utils/Loader.d.ts

@@ -1,6 +1,9 @@
 export declare class Loader {
     private readonly spinnerStyles;
     private readonly elementId;
+    private static instance;
+    private constructor();
+    static getInstance(): Loader;
     get element(): HTMLElement;
     show(): void;
     hide(): void;

package/dist/ui-utils/Loader.js

@@ -4,9 +4,15 @@ exports.Loader = void 0;
 const SpinnerStyles_1 = require("./SpinnerStyles");
 class Loader {
     constructor() {
-        this.spinnerStyles = new SpinnerStyles_1.SpinnerStyles();
+        this.spinnerStyles = SpinnerStyles_1.SpinnerStyles.getInstance();
         this.elementId = "dry-ux-loader";
     }
+    static getInstance() {
+        if (!Loader.instance) {
+            Loader.instance = new Loader();
+        }
+        return Loader.instance;
+    }
     get element() {
         return document.getElementById(this.elementId);
     }

package/dist/ui-utils/Spinner.js

@@ -5,7 +5,7 @@ const React = require("react");
 const SpinnerStyles_1 = require("./SpinnerStyles");
 exports.Spinner = React.memo(() => {
     React.useEffect(() => {
-        const spinnerStyles = new SpinnerStyles_1.SpinnerStyles();
+        const spinnerStyles = SpinnerStyles_1.SpinnerStyles.getInstance();
         spinnerStyles.add();
     }, []);
     return React.createElement("div", { className: "dry-ux-spinner" });

package/dist/ui-utils/SpinnerStyles.d.ts

@@ -1,5 +1,8 @@
 export declare class SpinnerStyles {
     private readonly css;
     private readonly id;
+    private static instance;
+    private constructor();
+    static getInstance(): SpinnerStyles;
     add(): HTMLStyleElement;
 }

package/dist/ui-utils/SpinnerStyles.js

@@ -32,7 +32,8 @@ class SpinnerStyles {
         }
         
         .dry-ux-spinner:not(.fullscreen) {
-          padding: 20px
+          padding: 20px;
+          display: inline-block;
         }
         
         /* :not(:required) hides these rules from IE9 and below */
@@ -131,6 +132,12 @@ class SpinnerStyles {
 `;
         this.id = "dry-ux-loader-styles";
     }
+    static getInstance() {
+        if (!SpinnerStyles.instance) {
+            SpinnerStyles.instance = new SpinnerStyles();
+        }
+        return SpinnerStyles.instance;
+    }
     add() {
         if (!document.getElementById(this.id)) {
             let el = document.createElement("style");

package/dist/ui-utils/UIUtilProvider.d.ts

@@ -4,11 +4,13 @@ import "../types";
 export interface IUIUtilProviderState {
     modal: IUIUtilModal;
     alert: IUIUtilAlert;
-    loader: IUIUtilLoader;
+    customLoader: IUIUtilLoader;
+    loader: Pick<IUIUtilLoader, "show" | "hide">;
 }
 export declare const UIUtilContext: React.Context<IUIUtilProviderState>;
 export declare const useUIUtilContext: () => IUIUtilProviderState;
 export declare class UIUtilProvider extends React.PureComponent<{}, IUIUtilProviderState> {
+    private readonly loader;
     constructor(props: any);
     get modalDefaults(): {
         create: any;
@@ -29,11 +31,15 @@ export declare class UIUtilProvider extends React.PureComponent<{}, IUIUtilProvi
         show: any;
         showNoty: any;
     };
-    get loaderDefaults(): {
+    get customLoaderDefaults(): {
         show: () => void;
         hide: () => void;
         shown: boolean;
     };
+    get loaderDefaults(): {
+        show: () => void;
+        hide: () => void;
+    };
     showNotifyAlert(message: string, alertType: AlertType, position?: string, bindToElement?: any): void;
     showNoty(message: string, alertType: AlertType): void;
     toggleModalInstance(id: string, shown: boolean, destroyOnClose?: boolean): void;

package/dist/ui-utils/UIUtilProvider.js

@@ -4,6 +4,7 @@ exports.UIUtilProvider = exports.useUIUtilContext = exports.UIUtilContext = void
 const React = require("react");
 require("../types");
 const react_bootstrap_1 = require("react-bootstrap");
+const Loader_1 = require("./Loader");
 const defaultState = {
     modal: {
         show: null,
@@ -18,11 +19,15 @@ const defaultState = {
         show: null,
         showNoty: null,
     },
-    loader: {
+    customLoader: {
         shown: false,
         show: null,
         hide: null,
     },
+    loader: {
+        show: null,
+        hide: null,
+    },
 };
 exports.UIUtilContext = React.createContext(defaultState);
 const useUIUtilContext = () => React.useContext(exports.UIUtilContext);
@@ -30,7 +35,8 @@ exports.useUIUtilContext = useUIUtilContext;
 class UIUtilProvider extends React.PureComponent {
     constructor(props) {
         super(props);
-        this.state = Object.assign(Object.assign({}, defaultState), { modal: this.modalDefaults, alert: this.alertDefaults, loader: this.loaderDefaults });
+        this.loader = Loader_1.Loader.getInstance();
+        this.state = Object.assign(Object.assign({}, defaultState), { modal: this.modalDefaults, alert: this.alertDefaults, customLoader: this.customLoaderDefaults, loader: this.loaderDefaults });
     }
     get modalDefaults() {
         return Object.assign(Object.assign({}, defaultState.modal), { create: this.createModal.bind(this), show: (options) => this.createModal(null, options), getCurrent: () => {
@@ -58,13 +64,16 @@ class UIUtilProvider extends React.PureComponent {
             showNoty: this.showNoty.bind(this),
         };
     }
-    get loaderDefaults() {
-        return Object.assign(Object.assign({}, defaultState.loader), { show: () => this.setState({
-                loader: Object.assign(Object.assign({}, this.state.loader), { shown: true }),
+    get customLoaderDefaults() {
+        return Object.assign(Object.assign({}, defaultState.customLoader), { show: () => this.setState({
+                customLoader: Object.assign(Object.assign({}, this.state.customLoader), { shown: true }),
             }), hide: () => this.setState({
-                loader: Object.assign(Object.assign({}, this.state.loader), { shown: false }),
+                customLoader: Object.assign(Object.assign({}, this.state.customLoader), { shown: false }),
             }) });
     }
+    get loaderDefaults() {
+        return Object.assign(Object.assign({}, defaultState.loader), { show: () => this.loader.show(), hide: () => this.loader.hide() });
+    }
     showNotifyAlert(message, alertType, position, bindToElement) {
         Promise.resolve().then(() => require(/* webpackChunkName: "notify" */ "../external-dependencies/notify-js/notify")).then(() => {
             const options = Object.assign(Object.assign({}, (alertType && { className: alertType })), (position && { position }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dry-ux",
-  "version": "1.32.0",
+  "version": "1.34.0",
   "description": "",
   "main": "dist/index",
   "scripts": {