react-router-concent 2.2.8 → 2.2.9

package/dist/react-router-concent.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("concent"),require("react"),require("react-router-dom")):"function"==typeof define&&define.amd?define(["exports","concent","react","react-router-dom"],t):t(e["react-router-concent"]={},e.concent,e.React,e.rrd)}(this,(function(e,t,n,o){"use strict";var r="default"in t?t.default:t,c=null,i=Array.prototype.slice,a={callByApi:!1,callTime:0};function l(){throw new Error("you may forget to initialize <ConnectRouter /> or call createHistoryProxy in your app!")}function u(){var e=i.call(arguments),t=e[0],n=i.call(e[1]);c?(a={callByApi:!0,callTime:Date.now()},c[t].apply(null,n)):l()}function s(){return a}function f(e){c=e}var d=null;function y(){if(d)return d;var e={block:function(){u("block",arguments)},createHref:function(){u("createHref",arguments)},go:function(){u("go",arguments)},goBack:function(){u("goBack",arguments)},goForward:function(){u("goForward",arguments)},listen:function(){u("listen",arguments)},push:function(){u("push",arguments)},replace:function(){u("replace",arguments)},getRouterHistory:function(){return c}};return window&&window.location&&(e.location=window.location),d=e,window&&!window.cc_history&&(window.cc_history=d),d}const p="$$CONCENT_ROUTER",g="onUrlChanged";var h=p,m=g;const w=function(e){h=e},_=function(){return h},v=function(e){m=e},C=function(){return m};var R=["PUSH","POP","REPLACE"],P=0;let x,k=1;function E(e,n){e.__insId||(e.__insId=(k++,k),x=e.__insId);var o=!0===n;P>0&&!t.ccContext.isHotReloadMode()?console.warn("historyProxy already been created! you can not init ConnectedRouter or call createHistoryProxy more than one time."):(P+=1,f(e),e.listen(((n,r)=>{if(e.__insId===x){var c=_(),i=C(),l=s();if(Date.now()-l.time>300&&(a={callByApi:!1,callTime:0}),R.includes(r))t.getState(c)?t.setState(c,n):console.warn("forget to call configRouterModule after cc.run, react-router-concent will ignore writing the changed state");setTimeout((function(){if(o)t.emit(i,n,r,e);else{var c=Date.now();t.emit({name:i,canPerform:e=>{var t=e.ctx.initTime;return c-t>400}},n,r,e)}}),300)}})))}var H={id:"__connect_router_span_by_fantasticsoul__",style:{display:"none",width:0,height:0}},N=o.withRouter(class extends n.Component{constructor(e,t){super(e,t);var n=e.history;E(n,!0===e.callUrlChangedOnInit),e.connected&&e.connected(n)}render(){return this.props.children||n.createElement("span",H)}}),I=y();const T=N,U=function(e){var t=e.style,o=e.to,r=e.onClick,c={className:e.className,href:"javascript:;",onClick:function(t){t.stopPropagation&&(!1===e.stop||t.stopPropagation()),I.push(o),r&&r(o)},style:t};return n.createElement("a",c,e.children)},b=y(),A=E,B=(e={})=>{const t=e.module||p,n=e.onUrlChanged||g;w(t),v(n),r.configure(t,{state:{hash:"",key:"",pathname:"",search:"",state:null}})},L=_,M=C,O=s;var j={ConnectRouter:T,Link:U,history:b,createHistoryProxy:A,configureRoute:B,getModuleName:L,getUrlChangedEvName:M,getLatestCallInfo:O};e.ConnectRouter=T,e.Link=U,e.history=b,e.createHistoryProxy=A,e.configureRoute=B,e.getModuleName=L,e.getUrlChangedEvName=M,e.getLatestCallInfo=O,e.default=j,Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("concent"),require("react"),require("react-router-dom")):"function"==typeof define&&define.amd?define(["exports","concent","react","react-router-dom"],t):t(e["react-router-concent"]={},e.concent,e.React,e.rrd)}(this,(function(e,t,n,o){"use strict";var r="default"in t?t.default:t,c=null,i=Array.prototype.slice,a={callByApi:!1,callTime:0};function l(){throw new Error("you may forget to initialize <ConnectRouter /> or call createHistoryProxy in your app!")}function u(){var e=i.call(arguments),t=e[0],n=i.call(e[1]);c?(a={callByApi:!0,callTime:Date.now()},c[t].apply(null,n)):l()}function s(){return a}function f(e){c=e}var d=null;function y(){if(d)return d;var e={block:function(){u("block",arguments)},createHref:function(){u("createHref",arguments)},go:function(){u("go",arguments)},goBack:function(){u("goBack",arguments)},goForward:function(){u("goForward",arguments)},listen:function(){u("listen",arguments)},push:function(){u("push",arguments)},replace:function(){u("replace",arguments)},getRouterHistory:function(){return c}};return window&&window.location&&(e.location=window.location),d=e,window&&!window.cc_history&&(window.cc_history=d),d}const p="$$CONCENT_ROUTER",g="onUrlChanged";var h=p,m=g;const w=function(e){h=e},_=function(){return h},C=function(e){m=e},v=function(){return m};var R=["PUSH","POP","REPLACE"],P=0;let x,k=1;function E(e,n,o){e.__insId||(e.__insId=(k++,k),x=e.__insId);var r=!0===n;P>0&&!t.ccContext.isHotReloadMode()?console.warn("historyProxy already been created! you can not init ConnectedRouter or call createHistoryProxy more than one time."):(P+=1,f(e),e.listen(((n,c)=>{if(e.__insId===x){o&&o(n,c);var i=_(),l=v(),u=s();if(Date.now()-u.time>300&&(a={callByApi:!1,callTime:0}),R.includes(c))t.getState(i)?t.setState(i,n):console.warn("forget to call configRouterModule after cc.run, react-router-concent will ignore writing the changed state");setTimeout((function(){if(r)t.emit(l,n,c,e);else{var o=Date.now();t.emit({name:l,canPerform:e=>{var t=e.ctx.initTime;return o-t>400}},n,c,e)}}),300)}})))}var H={id:"__connect_router_span_by_fantasticsoul__",style:{display:"none",width:0,height:0}},N=o.withRouter(class extends n.Component{constructor(e,t){super(e,t);var n=e.history;E(n,!0===e.callUrlChangedOnInit,e.onUrlChange),e.connected&&e.connected(n)}render(){return this.props.children||n.createElement("span",H)}}),U=y();const I=N,T=function(e){var t=e.style,o=e.to,r=e.onClick,c={className:e.className,href:"javascript:;",onClick:function(t){t.stopPropagation&&(!1===e.stop||t.stopPropagation()),U.push(o),r&&r(o)},style:t};return n.createElement("a",c,e.children)},b=y(),A=E,B=(e={})=>{const t=e.module||p,n=e.onUrlChanged||g;w(t),C(n),r.configure(t,{state:{hash:"",key:"",pathname:"",search:"",state:null}})},L=_,M=v,O=s;var j={ConnectRouter:I,Link:T,history:b,createHistoryProxy:A,configureRoute:B,getModuleName:L,getUrlChangedEvName:M,getLatestCallInfo:O};e.ConnectRouter=I,e.Link=T,e.history=b,e.createHistoryProxy=A,e.configureRoute=B,e.getModuleName=L,e.getUrlChangedEvName=M,e.getLatestCallInfo=O,e.default=j,Object.defineProperty(e,"__esModule",{value:!0})}));

package/dist/react-router-concent.min.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("concent"),require("react"),require("react-router-dom")):"function"==typeof define&&define.amd?define(["exports","concent","react","react-router-dom"],t):t(e["react-router-concent"]={},e.concent,e.React,e.rrd)}(this,(function(e,t,n,o){"use strict";var r="default"in t?t.default:t,c=null,i=Array.prototype.slice,a={callByApi:!1,callTime:0};function l(){throw new Error("you may forget to initialize <ConnectRouter /> or call createHistoryProxy in your app!")}function u(){var e=i.call(arguments),t=e[0],n=i.call(e[1]);c?(a={callByApi:!0,callTime:Date.now()},c[t].apply(null,n)):l()}function s(){return a}function f(e){c=e}var d=null;function y(){if(d)return d;var e={block:function(){u("block",arguments)},createHref:function(){u("createHref",arguments)},go:function(){u("go",arguments)},goBack:function(){u("goBack",arguments)},goForward:function(){u("goForward",arguments)},listen:function(){u("listen",arguments)},push:function(){u("push",arguments)},replace:function(){u("replace",arguments)},getRouterHistory:function(){return c}};return window&&window.location&&(e.location=window.location),d=e,window&&!window.cc_history&&(window.cc_history=d),d}const p="$$CONCENT_ROUTER",g="onUrlChanged";var h=p,m=g;const w=function(e){h=e},_=function(){return h},v=function(e){m=e},C=function(){return m};var R=["PUSH","POP","REPLACE"],P=0;let x,k=1;function E(e,n){e.__insId||(e.__insId=(k++,k),x=e.__insId);var o=!0===n;P>0&&!t.ccContext.isHotReloadMode()?console.warn("historyProxy already been created! you can not init ConnectedRouter or call createHistoryProxy more than one time."):(P+=1,f(e),e.listen(((n,r)=>{if(e.__insId===x){var c=_(),i=C(),l=s();if(Date.now()-l.time>300&&(a={callByApi:!1,callTime:0}),R.includes(r))t.getState(c)?t.setState(c,n):console.warn("forget to call configRouterModule after cc.run, react-router-concent will ignore writing the changed state");setTimeout((function(){if(o)t.emit(i,n,r,e);else{var c=Date.now();t.emit({name:i,canPerform:e=>{var t=e.ctx.initTime;return c-t>400}},n,r,e)}}),300)}})))}var H={id:"__connect_router_span_by_fantasticsoul__",style:{display:"none",width:0,height:0}},N=o.withRouter(class extends n.Component{constructor(e,t){super(e,t);var n=e.history;E(n,!0===e.callUrlChangedOnInit),e.connected&&e.connected(n)}render(){return this.props.children||n.createElement("span",H)}}),I=y();const T=N,U=function(e){var t=e.style,o=e.to,r=e.onClick,c={className:e.className,href:"javascript:;",onClick:function(t){t.stopPropagation&&(!1===e.stop||t.stopPropagation()),I.push(o),r&&r(o)},style:t};return n.createElement("a",c,e.children)},b=y(),A=E,B=(e={})=>{const t=e.module||p,n=e.onUrlChanged||g;w(t),v(n),r.configure(t,{state:{hash:"",key:"",pathname:"",search:"",state:null}})},L=_,M=C,O=s;var j={ConnectRouter:T,Link:U,history:b,createHistoryProxy:A,configureRoute:B,getModuleName:L,getUrlChangedEvName:M,getLatestCallInfo:O};e.ConnectRouter=T,e.Link=U,e.history=b,e.createHistoryProxy=A,e.configureRoute=B,e.getModuleName=L,e.getUrlChangedEvName=M,e.getLatestCallInfo=O,e.default=j,Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("concent"),require("react"),require("react-router-dom")):"function"==typeof define&&define.amd?define(["exports","concent","react","react-router-dom"],t):t(e["react-router-concent"]={},e.concent,e.React,e.rrd)}(this,(function(e,t,n,o){"use strict";var r="default"in t?t.default:t,c=null,i=Array.prototype.slice,a={callByApi:!1,callTime:0};function l(){throw new Error("you may forget to initialize <ConnectRouter /> or call createHistoryProxy in your app!")}function u(){var e=i.call(arguments),t=e[0],n=i.call(e[1]);c?(a={callByApi:!0,callTime:Date.now()},c[t].apply(null,n)):l()}function s(){return a}function f(e){c=e}var d=null;function y(){if(d)return d;var e={block:function(){u("block",arguments)},createHref:function(){u("createHref",arguments)},go:function(){u("go",arguments)},goBack:function(){u("goBack",arguments)},goForward:function(){u("goForward",arguments)},listen:function(){u("listen",arguments)},push:function(){u("push",arguments)},replace:function(){u("replace",arguments)},getRouterHistory:function(){return c}};return window&&window.location&&(e.location=window.location),d=e,window&&!window.cc_history&&(window.cc_history=d),d}const p="$$CONCENT_ROUTER",g="onUrlChanged";var h=p,m=g;const w=function(e){h=e},_=function(){return h},C=function(e){m=e},v=function(){return m};var R=["PUSH","POP","REPLACE"],P=0;let x,k=1;function E(e,n,o){e.__insId||(e.__insId=(k++,k),x=e.__insId);var r=!0===n;P>0&&!t.ccContext.isHotReloadMode()?console.warn("historyProxy already been created! you can not init ConnectedRouter or call createHistoryProxy more than one time."):(P+=1,f(e),e.listen(((n,c)=>{if(e.__insId===x){o&&o(n,c);var i=_(),l=v(),u=s();if(Date.now()-u.time>300&&(a={callByApi:!1,callTime:0}),R.includes(c))t.getState(i)?t.setState(i,n):console.warn("forget to call configRouterModule after cc.run, react-router-concent will ignore writing the changed state");setTimeout((function(){if(r)t.emit(l,n,c,e);else{var o=Date.now();t.emit({name:l,canPerform:e=>{var t=e.ctx.initTime;return o-t>400}},n,c,e)}}),300)}})))}var H={id:"__connect_router_span_by_fantasticsoul__",style:{display:"none",width:0,height:0}},N=o.withRouter(class extends n.Component{constructor(e,t){super(e,t);var n=e.history;E(n,!0===e.callUrlChangedOnInit,e.onUrlChange),e.connected&&e.connected(n)}render(){return this.props.children||n.createElement("span",H)}}),U=y();const I=N,T=function(e){var t=e.style,o=e.to,r=e.onClick,c={className:e.className,href:"javascript:;",onClick:function(t){t.stopPropagation&&(!1===e.stop||t.stopPropagation()),U.push(o),r&&r(o)},style:t};return n.createElement("a",c,e.children)},b=y(),A=E,B=(e={})=>{const t=e.module||p,n=e.onUrlChanged||g;w(t),C(n),r.configure(t,{state:{hash:"",key:"",pathname:"",search:"",state:null}})},L=_,M=v,O=s;var j={ConnectRouter:I,Link:T,history:b,createHistoryProxy:A,configureRoute:B,getModuleName:L,getUrlChangedEvName:M,getLatestCallInfo:O};e.ConnectRouter=I,e.Link=T,e.history=b,e.createHistoryProxy=A,e.configureRoute=B,e.getModuleName=L,e.getUrlChangedEvName=M,e.getLatestCallInfo=O,e.default=j,Object.defineProperty(e,"__esModule",{value:!0})}));

package/es/component/ConnectRouter.js

@@ -25,7 +25,7 @@ export default rrd.withRouter(
       var history = props.history;
       var callUrlChangedOnInit = props.callUrlChangedOnInit === true;
 
-      createHistoryProxy(history, callUrlChangedOnInit);
+      createHistoryProxy(history, callUrlChangedOnInit, props.onUrlChange);
       if (props.connected) {
         props.connected(history);
       }

package/es/index.d.ts

@@ -9,6 +9,10 @@ export const ROUTER_MODULE: '$$CONCENT_ROUTER';
 
 type CRProps = {
   callUrlChangedOnInit?: boolean,
+  /**
+   * 相比 callUrlChangedOnInit，这个是实时的，没有延迟，方便做一些更方便的清理操作动作
+   */
+  onUrlChange?: (param: any, action: any) => void;
   connected?: (History: H.History) => void,
 };
 export class ConnectRouter extends Component<CRProps, {}> { }
@@ -35,7 +39,7 @@ export declare const history: {
   location: Location,
 };
 
-export function createHistoryProxy(history: H.History, callUrlChangedOnInit?: boolean): void;
+export function createHistoryProxy(history: H.History, callUrlChangedOnInit?: boolean, onUrlChange?: CRProps['onUrlChange']): void;
 export function configureRoute(config?: { module?: string, onUrlChanged?: string }): void;
 export interface IRouterState<T extends any = any> {
   hash: string,

package/es/util/createHistoryProxy.js

@@ -18,7 +18,7 @@ function getInsId() {
   return insId;
 }
 
-export default function createHistoryProxy(history, callUrlChangedOnInit) {
+export default function createHistoryProxy(history, callUrlChangedOnInit, onUrlChange) {
 
   if (!history.__insId) {
     history.__insId = getInsId();
@@ -42,6 +42,7 @@ export default function createHistoryProxy(history, callUrlChangedOnInit) {
     // 防止CodeSandbox热加载模式下，多个history实例同时监听都有效
     // 只能让最新的一个history的监听起效
     if (history.__insId !== validInsId) return;
+    if (onUrlChange) onUrlChange(param, action);
 
     var modName = confMod.getModuleName();
     var urlChangedEvName = confMod.getUrlChangedEvName();
@@ -60,17 +61,17 @@ export default function createHistoryProxy(history, callUrlChangedOnInit) {
       }
     }
 
-    //给300毫秒延迟，
-    //既让concent有足够时间把该卸载的组件卸掉
-    //也让concent有足够的时间把改挂的组件全部挂上(对于那种初次挂的组件)
-    //然后在去刷新对应的cc组件
+    // 给300毫秒延迟，
+    // 既让concent有足够时间把该卸载的组件卸掉
+    // 也让concent有足够的时间把该挂的组件全部挂上(对于那种初次挂的组件)
+    // 然后再去刷新对应的cc组件
     setTimeout(function () {
       //onUrlChanged在组件初次挂载的时候也会执行
       if (_callUrlChangedOnInit) {
         cc.emit(urlChangedEvName, param, action, history);
         return;
       }
-      
+
       var now = Date.now();
       cc.emit({
         name: urlChangedEvName, canPerform: ref => {

package/lib/component/ConnectRouter.js

@@ -31,7 +31,7 @@ export default rrd.withRouter(class extends React.Component {
     super(props, context);
     var history = props.history;
     var callUrlChangedOnInit = props.callUrlChangedOnInit === true;
-    createHistoryProxy(history, callUrlChangedOnInit);
+    createHistoryProxy(history, callUrlChangedOnInit, props.onUrlChange);
 
     if (props.connected) {
       props.connected(history);

package/lib/util/createHistoryProxy.js

@@ -16,7 +16,7 @@ function getInsId() {
   return insId;
 }
 
-export default function createHistoryProxy(history, callUrlChangedOnInit) {
+export default function createHistoryProxy(history, callUrlChangedOnInit, onUrlChange) {
   if (!history.__insId) {
     history.__insId = getInsId();
     validInsId = history.__insId;
@@ -39,6 +39,7 @@ export default function createHistoryProxy(history, callUrlChangedOnInit) {
     // 防止CodeSandbox热加载模式下，多个history实例同时监听都有效
     // 只能让最新的一个history的监听起效
     if (history.__insId !== validInsId) return;
+    if (onUrlChange) onUrlChange(param, action);
     var modName = confMod.getModuleName();
     var urlChangedEvName = confMod.getUrlChangedEvName();
     var callInfo = historyProxy.getLatestCallInfo();
@@ -55,10 +56,10 @@ export default function createHistoryProxy(history, callUrlChangedOnInit) {
       } else {
         cc.setState(modName, param);
       }
-    } //给300毫秒延迟，
-    //既让concent有足够时间把该卸载的组件卸掉
-    //也让concent有足够的时间把改挂的组件全部挂上(对于那种初次挂的组件)
-    //然后在去刷新对应的cc组件
+    } // 给300毫秒延迟，
+    // 既让concent有足够时间把该卸载的组件卸掉
+    // 也让concent有足够的时间把该挂的组件全部挂上(对于那种初次挂的组件)
+    // 然后再去刷新对应的cc组件
 
 
     setTimeout(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-concent",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "description": "let using react-router more easily in concent",
   "main": "dist/react-router-concent.js",
   "types": "src/index.d.ts",

package/src/component/ConnectRouter.js

@@ -25,7 +25,7 @@ export default rrd.withRouter(
       var history = props.history;
       var callUrlChangedOnInit = props.callUrlChangedOnInit === true;
 
-      createHistoryProxy(history, callUrlChangedOnInit);
+      createHistoryProxy(history, callUrlChangedOnInit, props.onUrlChange);
       if (props.connected) {
         props.connected(history);
       }

package/src/index.d.ts

@@ -9,6 +9,10 @@ export const ROUTER_MODULE: '$$CONCENT_ROUTER';
 
 type CRProps = {
   callUrlChangedOnInit?: boolean,
+  /**
+   * 相比 callUrlChangedOnInit，这个是实时的，没有延迟，方便做一些更方便的清理操作动作
+   */
+  onUrlChange?: (param: any, action: any) => void;
   connected?: (History: H.History) => void,
 };
 export class ConnectRouter extends Component<CRProps, {}> { }
@@ -35,7 +39,7 @@ export declare const history: {
   location: Location,
 };
 
-export function createHistoryProxy(history: H.History, callUrlChangedOnInit?: boolean): void;
+export function createHistoryProxy(history: H.History, callUrlChangedOnInit?: boolean, onUrlChange?: CRProps['onUrlChange']): void;
 export function configureRoute(config?: { module?: string, onUrlChanged?: string }): void;
 export interface IRouterState<T extends any = any> {
   hash: string,

package/src/util/createHistoryProxy.js

@@ -18,7 +18,7 @@ function getInsId() {
   return insId;
 }
 
-export default function createHistoryProxy(history, callUrlChangedOnInit) {
+export default function createHistoryProxy(history, callUrlChangedOnInit, onUrlChange) {
 
   if (!history.__insId) {
     history.__insId = getInsId();
@@ -42,6 +42,7 @@ export default function createHistoryProxy(history, callUrlChangedOnInit) {
     // 防止CodeSandbox热加载模式下，多个history实例同时监听都有效
     // 只能让最新的一个history的监听起效
     if (history.__insId !== validInsId) return;
+    if (onUrlChange) onUrlChange(param, action);
 
     var modName = confMod.getModuleName();
     var urlChangedEvName = confMod.getUrlChangedEvName();
@@ -60,17 +61,17 @@ export default function createHistoryProxy(history, callUrlChangedOnInit) {
       }
     }
 
-    //给300毫秒延迟，
-    //既让concent有足够时间把该卸载的组件卸掉
-    //也让concent有足够的时间把改挂的组件全部挂上(对于那种初次挂的组件)
-    //然后在去刷新对应的cc组件
+    // 给300毫秒延迟，
+    // 既让concent有足够时间把该卸载的组件卸掉
+    // 也让concent有足够的时间把该挂的组件全部挂上(对于那种初次挂的组件)
+    // 然后再去刷新对应的cc组件
     setTimeout(function () {
       //onUrlChanged在组件初次挂载的时候也会执行
       if (_callUrlChangedOnInit) {
         cc.emit(urlChangedEvName, param, action, history);
         return;
       }
-      
+
       var now = Date.now();
       cc.emit({
         name: urlChangedEvName, canPerform: ref => {