@redneckz/wildless-cms-uni-blocks 0.14.867 → 0.14.868

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.
@@ -1,2 +1,2 @@
1
1
  import { type BlockDef } from '../../model/ContentPageDef';
2
- export declare const useSortProductBlocks: (parentBlock?: BlockDef) => BlockDef[];
2
+ export declare const useSortProductBlocks: (parentBlock: BlockDef) => BlockDef[];
@@ -1,2 +1,2 @@
1
1
  import { type BlockDef } from '../../model/ContentPageDef';
2
- export declare const useSortProductBlocks: (parentBlock?: BlockDef) => BlockDef[];
2
+ export declare const useSortProductBlocks: (parentBlock: BlockDef) => BlockDef[];
@@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
2
2
  exports.useSortProductBlocks = void 0;
3
3
  const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
4
4
  const useSessionStore_1 = require("@redneckz/uni-jsx/lib/Store/useSessionStore");
5
- const useSortProductBlocks = (parentBlock = {}) => {
5
+ const useSortProductBlocks = (parentBlock) => {
6
6
  const [blocks, setBlocks] = (0, hooks_1.useState)(parentBlock.blocks ?? []);
7
7
  const sessionStore = (0, useSessionStore_1.useSessionStore)();
8
8
  const offerIds = sessionStore?.offerIds || [];
@@ -11,10 +11,14 @@ const useSortProductBlocks = (parentBlock = {}) => {
11
11
  const blocksByOfferIds = offerIds
12
12
  .map((id) => blocksMap.get(id))
13
13
  .filter((block) => Boolean(block));
14
- const tailBlocks = blocks.filter(({ __id = '' }) => !offerIds.includes(__id));
14
+ const tailBlocks = parentBlock.blocks?.filter(({ __id = '' }) => !offerIds.includes(__id)) ?? [];
15
15
  return [...blocksByOfferIds, ...tailBlocks];
16
- }, [blocks, offerIds]);
17
- (0, hooks_1.useEffect)(() => setBlocks(sortedBlocks), []);
16
+ }, [parentBlock, offerIds]);
17
+ (0, hooks_1.useEffect)(() => {
18
+ if (sortedBlocks.length) {
19
+ setBlocks(sortedBlocks);
20
+ }
21
+ }, [parentBlock]);
18
22
  return blocks;
19
23
  };
20
24
  exports.useSortProductBlocks = useSortProductBlocks;
@@ -1 +1 @@
1
- {"version":3,"file":"useSortProductBlocks.js","sourceRoot":"","sources":["../../../src/components/GalleryLayout/useSortProductBlocks.ts"],"names":[],"mappings":";;AAAA,uDAA2E;AAC3E,iFAA8E;AAGvE,MAAM,oBAAoB,GAAG,CAAC,cAAwB,EAAE,EAAc,EAAE;IAC7E,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAC,WAAW,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAE,CAAC;IACvC,MAAM,QAAQ,GAAa,YAAY,EAAE,QAAQ,IAAI,EAAE,CAAC;IAExD,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAChC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAE1F,MAAM,gBAAgB,GAAG,QAAQ;aAC9B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC9B,MAAM,CAAC,CAAC,KAAK,EAAqB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAExD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAE9E,OAAO,CAAC,GAAG,gBAAgB,EAAE,GAAG,UAAU,CAAC,CAAC;IAC9C,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEvB,IAAA,iBAAS,EAAC,GAAG,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7C,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AApBW,QAAA,oBAAoB,wBAoB/B"}
1
+ {"version":3,"file":"useSortProductBlocks.js","sourceRoot":"","sources":["../../../src/components/GalleryLayout/useSortProductBlocks.ts"],"names":[],"mappings":";;AAAA,uDAA2E;AAC3E,iFAA8E;AAGvE,MAAM,oBAAoB,GAAG,CAAC,WAAqB,EAAc,EAAE;IACxE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAC,WAAW,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAE,CAAC;IACvC,MAAM,QAAQ,GAAa,YAAY,EAAE,QAAQ,IAAI,EAAE,CAAC;IAExD,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAChC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAE1F,MAAM,gBAAgB,GAAG,QAAQ;aAC9B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC9B,MAAM,CAAC,CAAC,KAAK,EAAqB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAExD,MAAM,UAAU,GACd,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAEhF,OAAO,CAAC,GAAG,gBAAgB,EAAE,GAAG,UAAU,CAAC,CAAC;IAC9C,CAAC,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE5B,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,YAAY,CAAC,MAAM,EAAE;YACvB,SAAS,CAAC,YAAY,CAAC,CAAC;SACzB;IACH,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAzBW,QAAA,oBAAoB,wBAyB/B"}
@@ -1,2 +1,2 @@
1
1
  import { type BlockDef } from '../../model/ContentPageDef';
2
- export declare const useSortProductBlocks: (parentBlock?: BlockDef) => BlockDef[];
2
+ export declare const useSortProductBlocks: (parentBlock: BlockDef) => BlockDef[];
@@ -1,6 +1,6 @@
1
1
  import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
2
2
  import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
3
- export const useSortProductBlocks = (parentBlock = {}) => {
3
+ export const useSortProductBlocks = (parentBlock) => {
4
4
  const [blocks, setBlocks] = useState(parentBlock.blocks ?? []);
5
5
  const sessionStore = useSessionStore();
6
6
  const offerIds = sessionStore?.offerIds || [];
@@ -9,10 +9,14 @@ export const useSortProductBlocks = (parentBlock = {}) => {
9
9
  const blocksByOfferIds = offerIds
10
10
  .map((id) => blocksMap.get(id))
11
11
  .filter((block) => Boolean(block));
12
- const tailBlocks = blocks.filter(({ __id = '' }) => !offerIds.includes(__id));
12
+ const tailBlocks = parentBlock.blocks?.filter(({ __id = '' }) => !offerIds.includes(__id)) ?? [];
13
13
  return [...blocksByOfferIds, ...tailBlocks];
14
- }, [blocks, offerIds]);
15
- useEffect(() => setBlocks(sortedBlocks), []);
14
+ }, [parentBlock, offerIds]);
15
+ useEffect(() => {
16
+ if (sortedBlocks.length) {
17
+ setBlocks(sortedBlocks);
18
+ }
19
+ }, [parentBlock]);
16
20
  return blocks;
17
21
  };
18
22
  //# sourceMappingURL=useSortProductBlocks.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useSortProductBlocks.js","sourceRoot":"","sources":["../../../src/components/GalleryLayout/useSortProductBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAG9E,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,cAAwB,EAAE,EAAc,EAAE;IAC7E,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAa,YAAY,EAAE,QAAQ,IAAI,EAAE,CAAC;IAExD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAE1F,MAAM,gBAAgB,GAAG,QAAQ;aAC9B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC9B,MAAM,CAAC,CAAC,KAAK,EAAqB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAExD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAE9E,OAAO,CAAC,GAAG,gBAAgB,EAAE,GAAG,UAAU,CAAC,CAAC;IAC9C,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEvB,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7C,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
1
+ {"version":3,"file":"useSortProductBlocks.js","sourceRoot":"","sources":["../../../src/components/GalleryLayout/useSortProductBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAG9E,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,WAAqB,EAAc,EAAE;IACxE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAa,YAAY,EAAE,QAAQ,IAAI,EAAE,CAAC;IAExD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAE1F,MAAM,gBAAgB,GAAG,QAAQ;aAC9B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC9B,MAAM,CAAC,CAAC,KAAK,EAAqB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAExD,MAAM,UAAU,GACd,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAEhF,OAAO,CAAC,GAAG,gBAAgB,EAAE,GAAG,UAAU,CAAC,CAAC;IAC9C,CAAC,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE5B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,CAAC,MAAM,EAAE;YACvB,SAAS,CAAC,YAAY,CAAC,CAAC;SACzB;IACH,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
2
2
  import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
3
3
  import { type BlockDef } from '../../model/ContentPageDef';
4
4
 
5
- export const useSortProductBlocks = (parentBlock: BlockDef = {}): BlockDef[] => {
5
+ export const useSortProductBlocks = (parentBlock: BlockDef): BlockDef[] => {
6
6
  const [blocks, setBlocks] = useState(parentBlock.blocks ?? []);
7
7
  const sessionStore = useSessionStore();
8
8
  const offerIds: string[] = sessionStore?.offerIds || [];
@@ -14,12 +14,17 @@ export const useSortProductBlocks = (parentBlock: BlockDef = {}): BlockDef[] =>
14
14
  .map((id) => blocksMap.get(id))
15
15
  .filter((block): block is BlockDef => Boolean(block));
16
16
 
17
- const tailBlocks = blocks.filter(({ __id = '' }) => !offerIds.includes(__id));
17
+ const tailBlocks =
18
+ parentBlock.blocks?.filter(({ __id = '' }) => !offerIds.includes(__id)) ?? [];
18
19
 
19
20
  return [...blocksByOfferIds, ...tailBlocks];
20
- }, [blocks, offerIds]);
21
+ }, [parentBlock, offerIds]);
21
22
 
22
- useEffect(() => setBlocks(sortedBlocks), []);
23
+ useEffect(() => {
24
+ if (sortedBlocks.length) {
25
+ setBlocks(sortedBlocks);
26
+ }
27
+ }, [parentBlock]);
23
28
 
24
29
  return blocks;
25
30
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@redneckz/wildless-cms-uni-blocks",
3
- "version": "0.14.867",
3
+ "version": "0.14.868",
4
4
  "private": false,
5
5
  "license": "MIT",
6
6
  "author": "ЦК",
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
2
2
  import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
3
3
  import { type BlockDef } from '../../model/ContentPageDef';
4
4
 
5
- export const useSortProductBlocks = (parentBlock: BlockDef = {}): BlockDef[] => {
5
+ export const useSortProductBlocks = (parentBlock: BlockDef): BlockDef[] => {
6
6
  const [blocks, setBlocks] = useState(parentBlock.blocks ?? []);
7
7
  const sessionStore = useSessionStore();
8
8
  const offerIds: string[] = sessionStore?.offerIds || [];
@@ -14,12 +14,17 @@ export const useSortProductBlocks = (parentBlock: BlockDef = {}): BlockDef[] =>
14
14
  .map((id) => blocksMap.get(id))
15
15
  .filter((block): block is BlockDef => Boolean(block));
16
16
 
17
- const tailBlocks = blocks.filter(({ __id = '' }) => !offerIds.includes(__id));
17
+ const tailBlocks =
18
+ parentBlock.blocks?.filter(({ __id = '' }) => !offerIds.includes(__id)) ?? [];
18
19
 
19
20
  return [...blocksByOfferIds, ...tailBlocks];
20
- }, [blocks, offerIds]);
21
+ }, [parentBlock, offerIds]);
21
22
 
22
- useEffect(() => setBlocks(sortedBlocks), []);
23
+ useEffect(() => {
24
+ if (sortedBlocks.length) {
25
+ setBlocks(sortedBlocks);
26
+ }
27
+ }, [parentBlock]);
23
28
 
24
29
  return blocks;
25
30
  };