phx-react 1.3.1597 → 1.3.1598
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -6,10 +6,15 @@ const navigation_1 = require("next/navigation");
|
|
|
6
6
|
const page_tracker_store_1 = require("../stores/page-tracker/page-tracker-store");
|
|
7
7
|
const PHXUseRouterBack = () => {
|
|
8
8
|
const router = (0, navigation_1.useRouter)();
|
|
9
|
+
const searchParams = (0, navigation_1.useSearchParams)();
|
|
9
10
|
const referrer = (0, page_tracker_store_1.usePageTrackerStore)((state) => state.referrer);
|
|
10
11
|
const isFirstPage = (0, page_tracker_store_1.usePageTrackerStore)((state) => state.isFirstPage);
|
|
11
12
|
const routerBack = (backLink) => {
|
|
12
|
-
|
|
13
|
+
const isFromNotification = (searchParams === null || searchParams === void 0 ? void 0 : searchParams.get('ref')) === 'notification';
|
|
14
|
+
if (isFromNotification) {
|
|
15
|
+
router.push(backLink);
|
|
16
|
+
}
|
|
17
|
+
else if (isFirstPage && referrer) {
|
|
13
18
|
router.push(referrer);
|
|
14
19
|
}
|
|
15
20
|
else if (isFirstPage) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-router-back.js","sourceRoot":"","sources":["../../../src/hooks/use-router-back.ts"],"names":[],"mappings":";AAAA,YAAY,CAAA;;;AAEZ,
|
|
1
|
+
{"version":3,"file":"use-router-back.js","sourceRoot":"","sources":["../../../src/hooks/use-router-back.ts"],"names":[],"mappings":";AAAA,YAAY,CAAA;;;AAEZ,gDAA4D;AAC5D,kFAA+E;AAExE,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,MAAM,GAAG,IAAA,sBAAS,GAAE,CAAA;IAC1B,MAAM,YAAY,GAAG,IAAA,4BAAe,GAAE,CAAA;IACtC,MAAM,QAAQ,GAAG,IAAA,wCAAmB,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC/D,MAAM,WAAW,GAAG,IAAA,wCAAmB,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IAErE,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,EAAE;QACtC,MAAM,kBAAkB,GAAG,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,KAAK,CAAC,MAAK,cAAc,CAAA;QAEtE,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,IAAI,WAAW,IAAI,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,IAAI,WAAW,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,EAAE,CAAA;QACf,CAAC;IACH,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AArBY,QAAA,gBAAgB,oBAqB5B"}
|
|
@@ -1,12 +1,17 @@
|
|
|
1
1
|
'use client';
|
|
2
|
-
import { useRouter } from 'next/navigation';
|
|
2
|
+
import { useRouter, useSearchParams } from 'next/navigation';
|
|
3
3
|
import { usePageTrackerStore } from '../stores/page-tracker/page-tracker-store';
|
|
4
4
|
export const PHXUseRouterBack = () => {
|
|
5
5
|
const router = useRouter();
|
|
6
|
+
const searchParams = useSearchParams();
|
|
6
7
|
const referrer = usePageTrackerStore((state) => state.referrer);
|
|
7
8
|
const isFirstPage = usePageTrackerStore((state) => state.isFirstPage);
|
|
8
9
|
const routerBack = (backLink) => {
|
|
9
|
-
|
|
10
|
+
const isFromNotification = (searchParams === null || searchParams === void 0 ? void 0 : searchParams.get('ref')) === 'notification';
|
|
11
|
+
if (isFromNotification) {
|
|
12
|
+
router.push(backLink);
|
|
13
|
+
}
|
|
14
|
+
else if (isFirstPage && referrer) {
|
|
10
15
|
router.push(referrer);
|
|
11
16
|
}
|
|
12
17
|
else if (isFirstPage) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-router-back.js","sourceRoot":"","sources":["../../../src/hooks/use-router-back.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"use-router-back.js","sourceRoot":"","sources":["../../../src/hooks/use-router-back.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAA;AAE/E,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,YAAY,GAAG,eAAe,EAAE,CAAA;IACtC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC/D,MAAM,WAAW,GAAG,mBAAmB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IAErE,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,EAAE;QACtC,MAAM,kBAAkB,GAAG,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,KAAK,CAAC,MAAK,cAAc,CAAA;QAEtE,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,IAAI,WAAW,IAAI,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,IAAI,WAAW,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,EAAE,CAAA;QACf,CAAC;IACH,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}
|