react-ui-basics 0.0.236 → 0.0.238

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-ui-basics",
-  "version": "0.0.236",
+  "version": "0.0.238",
   "description": "",
   "module": "index.js",
   "_main": "index.cjs.js",

package/router/HistoryTools.d.ts

@@ -1,2 +1,9 @@
-export declare const pushLocation: (path: string) => any;
-export declare const replaceLocation: (path: string) => any;
+declare const history: History;
+declare type HistoryAction = 'pushState' | 'replaceState';
+declare type HistoryActionArgs = Parameters<typeof history[HistoryAction]>;
+declare type HistoryMiddleware = (action: HistoryAction, args: HistoryActionArgs) => HistoryActionArgs;
+export declare const pushLocation: (path: string) => void;
+export declare const replaceLocation: (path: string) => void;
+export declare const addMiddleware: (middleware: HistoryMiddleware) => void;
+export declare const removeMiddleware: (middleware: HistoryMiddleware) => void;
+export {};

package/router/HistoryTools.js

@@ -1,11 +1,18 @@
 import ReactConstants from "./../ReactConstants"; import {clientHeight as __clientHeight, clientWidth as __clientWidth, createAccessor as __createAccessor, data as __data, height as __height, left as __left, length as __length, pageX as __pageX, pageY as __pageY, props as __props, scrollLeft as __scrollLeft, scrollTop as __scrollTop, state as __state, style as __style, target as __target, top as __top, value as __value, width as __width} from "./../CommonFields"; import {toConsumableArray as __toConsumableArray} from "./../_virtual/_rollupPluginBabelHelpers"; import {extends as __extends} from "./../_virtual/_rollupPluginBabelHelpers"; import {inherits as __inherits} from "./../_virtual/_rollupPluginBabelHelpers"; import { WINDOW } from '../Tools.js';
 
 const history = WINDOW.history;
+const middlewares = [];
 const events = ['pushState', 'replaceState'];
 events.forEach(e => {
     var original = history[e];
     history[e] = function () {
-        original.apply(history, arguments);
+        let args = arguments;
+        for (const middleware of middlewares) {
+            args = middleware(e, args);
+            if (!args)
+                break;
+        }
+        args && original.apply(history, args);
         fireEvent(e);
     };
 });

package/router/HistoryTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"HistoryTools.js","sources":["../src/router/HistoryTools.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAEA,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;AAE/B,MAAM,MAAM,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;AAC7C,MAAM,CAAC,OAAO,CAAC,CAAC,IAAG;AACf,IAAA,IAAI,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,YAAA;AACT,QAAA,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACnC,SAAS,CAAC,CAAC,CAAC,CAAC;AACjB,KAAC,CAAA;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,CAAC,IAAI,KAAI;AACvB,IAAA,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AACnE,IAAA,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC,CAAC;AAEK,MAAM,YAAY,GAAG,CAAC,IAAY,KAAK,IAAI,KAAK,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;MAE3G,eAAe,GAAG,CAAC,IAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;AAEtF,IAAI,MAAM,CAAC,4BAA4B,CAAC,EAAE;;;IAGtC,MAAM,CAAC,eAAe,CAAC,GAAG;QACtB,eAAe;KAClB,CAAA;AACJ;;;;"}
+{"version":3,"file":"HistoryTools.js","sources":["../src/router/HistoryTools.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAEA,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;AAM/B,MAAM,WAAW,GAAwB,EAAE,CAAA;AAE3C,MAAM,MAAM,GAAoB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;AAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,IAAG;AACf,IAAA,IAAI,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,YAAA;QACT,IAAI,IAAI,GAAG,SAAqC,CAAC;AACjD,QAAA,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;AAClC,YAAA,IAAI,GAAG,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;AAC1B,YAAA,IAAI,CAAC,IAAI;gBAAE,MAAK;AACnB,SAAA;QACD,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACtC,SAAS,CAAC,CAAC,CAAC,CAAC;AACjB,KAAC,CAAA;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,CAAC,IAAI,KAAI;AACvB,IAAA,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AACnE,IAAA,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC,CAAC;AAEK,MAAM,YAAY,GAAG,CAAC,IAAY,KAAK,IAAI,KAAK,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;MAE3G,eAAe,GAAG,CAAC,IAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;AAUtF,IAAI,MAAM,CAAC,4BAA4B,CAAC,EAAE;;;IAGtC,MAAM,CAAC,eAAe,CAAC,GAAG;QACtB,eAAe;KAClB,CAAA;AACJ;;;;"}

package/src/AutocompleteSelect.js

@@ -147,7 +147,7 @@ class AutocompleteSelect extends PureComponent {
             this.initSelected(__props(this), __state(this))
         if (__state(this).isActive && !prevState.isActive)
             this.updateListPosition()
-        if (__state(this).isActive !== !prevState.isActive)
+        if (__state(this).isActive !== prevState.isActive)
             orNoop(__props(this).onIsActiveChange)(__state(this).isActive)
     }
 

package/src/router/HistoryTools.ts

@@ -2,11 +2,22 @@ import {WINDOW} from "../Tools";
 
 const history = WINDOW.history;
 
-const events = ['pushState', 'replaceState'];
+type HistoryAction = 'pushState' | 'replaceState';
+type HistoryActionArgs = Parameters<typeof history[HistoryAction]>;
+type HistoryMiddleware = (action: HistoryAction, args: HistoryActionArgs) => HistoryActionArgs;
+
+const middlewares: HistoryMiddleware[] = []
+
+const events: HistoryAction[] = ['pushState', 'replaceState'];
 events.forEach(e => {
     var original = history[e];
     history[e] = function () {
-        original.apply(history, arguments);
+        let args = arguments as any as HistoryActionArgs;
+        for (const middleware of middlewares) {
+            args = middleware(e, args)
+            if (!args) break
+        }
+        args && original.apply(history, args);
         fireEvent(e);
     }
 });
@@ -20,6 +31,14 @@ export const pushLocation = (path: string) => path !== WINDOW.location.pathname
 
 export const replaceLocation = (path: string) => history[events[1]](null, null, path);
 
+export const addMiddleware = (middleware: HistoryMiddleware) => {
+    middlewares.push(middleware);
+};
+export const removeMiddleware = (middleware: HistoryMiddleware) => {
+    let index = middlewares.indexOf(middleware);
+    index !== -1 && middlewares.splice(index, 1);
+};
+
 if (window['isNotProductionEnvironment']) {
     // will be removed in production build
     // needed only to prevent bundler to remove 'unused' functions

package/src/router/Route.test.js

@@ -1,7 +1,7 @@
 import ReactConstants from "./ReactConstants"; import {clientHeight as __clientHeight, clientWidth as __clientWidth, createAccessor as __createAccessor, data as __data, height as __height, left as __left, length as __length, pageX as __pageX, pageY as __pageY, props as __props, scrollLeft as __scrollLeft, scrollTop as __scrollTop, state as __state, style as __style, target as __target, top as __top, value as __value, width as __width} from "./CommonFields"; import {toConsumableArray as __toConsumableArray} from "./_virtual/_rollupPluginBabelHelpers"; import {extends as __extends} from "./_virtual/_rollupPluginBabelHelpers"; import {inherits as __inherits} from "./_virtual/_rollupPluginBabelHelpers"; import React from 'react';
 import Route from "./Route";
 import {mount} from 'enzyme';
-import {pushLocation} from './HistoryTools'
+import {pushLocation, addMiddleware, removeMiddleware} from './HistoryTools'
 
 it('renders exact path', () => {
     pushLocation('/test');
@@ -131,4 +131,28 @@ it('do not render if regex does not match ', () => {
             <WithVariable/>
         </Route>
     </div>)).toHaveHTML('<div></div>');
+});
+
+it('middleware test', () => {
+    let middleware = (action, args) => {
+        expect(action).toBe('pushState');
+        expect(__length(args)).toBe(3);
+        expect(args[0]).toBe(null);
+        expect(args[1]).toBe(null);
+        expect(args[2]).toBe('/to-rewrite');
+        return [null, null, '/']
+    };
+    addMiddleware(middleware)
+    pushLocation('/to-rewrite');
+    removeMiddleware(middleware)
+
+    expect(mount(<Route path="/">
+        <div>test</div>
+    </Route>)).toContainReact(<div>test</div>);
+
+
+    pushLocation('/to-rewrite');
+    expect(mount(<Route path="/to-rewrite">
+        <div>to-rewrite</div>
+    </Route>)).toContainReact(<div>to-rewrite</div>);
 });