@redneckz/wildless-cms-uni-blocks 0.14.1024 → 0.14.1026

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.
Files changed (33) hide show
  1. package/bundle/bundle.umd.js +16 -6
  2. package/bundle/bundle.umd.min.js +1 -1
  3. package/bundle/ui-kit/UserSurveyDialog/UserSurveyDialogContent.d.ts +1 -0
  4. package/dist/ui-kit/UserSurveyDialog/UserSurveyDialog.js +8 -3
  5. package/dist/ui-kit/UserSurveyDialog/UserSurveyDialog.js.map +1 -1
  6. package/dist/ui-kit/UserSurveyDialog/UserSurveyDialogContent.d.ts +1 -0
  7. package/dist/ui-kit/UserSurveyDialog/useUserSurveyDialog.js +7 -2
  8. package/dist/ui-kit/UserSurveyDialog/useUserSurveyDialog.js.map +1 -1
  9. package/lib/ui-kit/UserSurveyDialog/UserSurveyDialog.js +8 -3
  10. package/lib/ui-kit/UserSurveyDialog/UserSurveyDialog.js.map +1 -1
  11. package/lib/ui-kit/UserSurveyDialog/UserSurveyDialogContent.d.ts +1 -0
  12. package/lib/ui-kit/UserSurveyDialog/useUserSurveyDialog.js +7 -2
  13. package/lib/ui-kit/UserSurveyDialog/useUserSurveyDialog.js.map +1 -1
  14. package/mobile/bundle/bundle.umd.js +16 -6
  15. package/mobile/bundle/bundle.umd.min.js +1 -1
  16. package/mobile/bundle/ui-kit/UserSurveyDialog/UserSurveyDialogContent.d.ts +1 -0
  17. package/mobile/dist/ui-kit/UserSurveyDialog/UserSurveyDialog.js +8 -3
  18. package/mobile/dist/ui-kit/UserSurveyDialog/UserSurveyDialog.js.map +1 -1
  19. package/mobile/dist/ui-kit/UserSurveyDialog/UserSurveyDialogContent.d.ts +1 -0
  20. package/mobile/dist/ui-kit/UserSurveyDialog/useUserSurveyDialog.js +7 -2
  21. package/mobile/dist/ui-kit/UserSurveyDialog/useUserSurveyDialog.js.map +1 -1
  22. package/mobile/lib/ui-kit/UserSurveyDialog/UserSurveyDialog.js +8 -3
  23. package/mobile/lib/ui-kit/UserSurveyDialog/UserSurveyDialog.js.map +1 -1
  24. package/mobile/lib/ui-kit/UserSurveyDialog/UserSurveyDialogContent.d.ts +1 -0
  25. package/mobile/lib/ui-kit/UserSurveyDialog/useUserSurveyDialog.js +7 -2
  26. package/mobile/lib/ui-kit/UserSurveyDialog/useUserSurveyDialog.js.map +1 -1
  27. package/mobile/src/ui-kit/UserSurveyDialog/UserSurveyDialog.tsx +9 -3
  28. package/mobile/src/ui-kit/UserSurveyDialog/UserSurveyDialogContent.ts +1 -0
  29. package/mobile/src/ui-kit/UserSurveyDialog/useUserSurveyDialog.ts +9 -2
  30. package/package.json +1 -1
  31. package/src/ui-kit/UserSurveyDialog/UserSurveyDialog.tsx +9 -3
  32. package/src/ui-kit/UserSurveyDialog/UserSurveyDialogContent.ts +1 -0
  33. package/src/ui-kit/UserSurveyDialog/useUserSurveyDialog.ts +9 -2
package/mobile/bundle/ui-kit/UserSurveyDialog/UserSurveyDialogContent.d.ts CHANGED
@@ -28,4 +28,5 @@ export interface UserSurveyDialogContent extends OnCloseProps, UniBlockContent {
28
28
  reasons: Reason[];
29
29
  } | JSONRefObject;
30
30
  isAfterTargetAction?: boolean;
31
+ onSkip?: () => void;
31
32
  }
package/mobile/dist/ui-kit/UserSurveyDialog/UserSurveyDialog.js CHANGED
@@ -13,7 +13,7 @@ const FirstStep_1 = require("./FirstStep");
13
13
  const SecondStep_1 = require("./SecondStep");
14
14
  const STEPS = [FirstStep_1.FirstStep, SecondStep_1.SecondStep, FinalStep_1.FinalStep];
15
15
  const LAST_STEP_INDEX = 2;
16
- exports.UserSurveyDialog = (0, UniBlock_1.UniBlock)(({ onClose = noop_1.noop, isAfterTargetAction = false, reasonsSource = {} }) => {
16
+ exports.UserSurveyDialog = (0, UniBlock_1.UniBlock)(({ onClose = noop_1.noop, isAfterTargetAction = false, reasonsSource = {}, onSkip = noop_1.noop }) => {
17
17
  const [isSending, { setTrue: startSending, setFalse: endSending }] = (0, useBool_1.useBool)(false);
18
18
  const [currentRating, setCurrentRating] = (0, hooks_1.useState)(0);
19
19
  const [currentReason, setCurrentReason] = (0, hooks_1.useState)();
@@ -42,7 +42,13 @@ exports.UserSurveyDialog = (0, UniBlock_1.UniBlock)(({ onClose = noop_1.noop, is
42
42
  };
43
43
  setStep(LAST_STEP_INDEX);
44
44
  }, [currentRating, currentReason]);
45
- return ((0, jsx_runtime_1.jsx)(Dialog_1.Dialog, { maxWidth: "xl", onClose: onClose, children: (0, jsx_runtime_1.jsx)(ActiveStep, { currentRating: currentRating, currentReason: currentReason, reasons: reasons, surveyType: surveyType, isSending: isSending, setCurrentReason: setCurrentReason, setCurrentRating: setCurrentRating, onSubmit: handleSubmit, onNextStep: handleNextStep }) }));
45
+ const handleClose = (0, hooks_1.useCallback)(() => {
46
+ if (step !== LAST_STEP_INDEX) {
47
+ onSkip();
48
+ }
49
+ onClose();
50
+ }, [step]);
51
+ return ((0, jsx_runtime_1.jsx)(Dialog_1.Dialog, { maxWidth: "xl", onClose: handleClose, children: (0, jsx_runtime_1.jsx)(ActiveStep, { currentRating: currentRating, currentReason: currentReason, reasons: reasons, surveyType: surveyType, isSending: isSending, setCurrentReason: setCurrentReason, setCurrentRating: setCurrentRating, onSubmit: handleSubmit, onNextStep: handleNextStep }) }));
46
52
  });
47
53
  const getMessage = (currentReason, message) => {
48
54
  if (currentReason?.text !== 'Другое') {
@@ -54,7 +60,6 @@ const getMessage = (currentReason, message) => {
54
60
  const getTimeAfter30days = () => Date.now() + 30 * 24 * 60 * 60 * 1000;
55
61
  // Если пользователь проходил опрос то показываем другой, иначе показываем случайный тип опроса
56
62
  const getUserSurveyType = (lastShownType) => {
57
- console.log('Расчитал');
58
63
  if (lastShownType) {
59
64
  return lastShownType === 'NPS' ? 'CSI' : 'NPS';
60
65
  }
package/mobile/dist/ui-kit/UserSurveyDialog/UserSurveyDialog.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/UserSurveyDialog.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/UserSurveyDialog.tsx"],"names":[],"mappings":";;;AAAA,uDAAoE;AACpE,iEAA8D;AAC9D,6EAA0E;AAC1E,6DAA0D;AAC1D,8DAA2D;AAC3D,sDAAmD;AACnD,2CAAwC;AACxC,2CAAwC;AACxC,2CAAwC;AACxC,6CAA0C;AAU1C,MAAM,KAAK,GAAG,CAAC,qBAAS,EAAE,uBAAU,EAAE,qBAAS,CAAC,CAAC;AACjD,MAAM,eAAe,GAAG,CAAC,CAAC;AAEb,QAAA,gBAAgB,GAAG,IAAA,mBAAQ,EACtC,CAAC,EAAE,OAAO,GAAG,WAAI,EAAE,mBAAmB,GAAG,KAAK,EAAE,aAAa,GAAG,EAAE,EAAE,MAAM,GAAG,WAAI,EAAE,EAAE,EAAE;IACrF,MAAM,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,GAAG,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC;IACpF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAAS,CAAC,CAAC,CAAC;IAC9D,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,GAAU,CAAC;IAC7D,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAS,CAAC,CAAC,CAAC;IAC5C,MAAM,eAAe,GAAG,IAAA,6BAAa,GAAwB,CAAC;IAC9D,MAAM,UAAU,GAAG,iBAAiB,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAEhF,MAAM,EAAE,OAAO,EAAE,GAAG,aAAsC,CAAC;IAE3D,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAE/B,MAAM,cAAc,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACtC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,YAAY,GAAG,IAAA,mBAAW,EAC9B,KAAK,EAAE,OAAgB,EAAE,EAAE;QACzB,YAAY,EAAE,CAAC;QAEf,MAAM,IAAA,+BAAc,EAAC;YACnB,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,aAAa,EAAE,IAAI;YAC3B,OAAO,EAAE,UAAU,CAAC,aAAa,EAAE,OAAO,CAAC;YAC3C,GAAG,EAAE,UAAU,CAAC,QAAQ,CAAC,IAAI;YAC7B,IAAI,EAAE,UAAU;YAChB,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,cAAc;SACjE,CAAC,CAAC;QACH,UAAU,EAAE,CAAC;QACb,eAAe,CAAC,UAAU,GAAG;YAC3B,aAAa,EAAE,UAAU;YACzB,SAAS,EAAE,kBAAkB,EAAE;SAChC,CAAC;QACF,OAAO,CAAC,eAAe,CAAC,CAAC;IAC3B,CAAC,EACD,CAAC,aAAa,EAAE,aAAa,CAAC,CAC/B,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACnC,IAAI,IAAI,KAAK,eAAe,EAAE;YAC5B,MAAM,EAAE,CAAC;SACV;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,OAAO,CACL,uBAAC,eAAM,IAAC,QAAQ,EAAC,IAAI,EAAC,OAAO,EAAE,WAAW,YACxC,uBAAC,UAAU,IACT,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,gBAAgB,EAClC,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,cAAc,GAC1B,GACK,CACV,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,aAAsB,EAAE,OAAgB,EAAE,EAAE;IAC9D,IAAI,aAAa,EAAE,IAAI,KAAK,QAAQ,EAAE;QACpC,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,wCAAwC,CAAC;AAC9E,CAAC,CAAC;AAEF,mCAAmC;AACnC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEvE,+FAA+F;AAC/F,MAAM,iBAAiB,GAAG,CAAC,aAA8B,EAAE,EAAE;IAC3D,IAAI,aAAa,EAAE;QACjB,OAAO,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;KAChD;IAED,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAmB,CAAC;AAC1D,CAAC,CAAC"}
package/mobile/dist/ui-kit/UserSurveyDialog/UserSurveyDialogContent.d.ts CHANGED
@@ -28,4 +28,5 @@ export interface UserSurveyDialogContent extends OnCloseProps, UniBlockContent {
28
28
  reasons: Reason[];
29
29
  } | JSONRefObject;
30
30
  isAfterTargetAction?: boolean;
31
+ onSkip?: () => void;
31
32
  }
package/mobile/dist/ui-kit/UserSurveyDialog/useUserSurveyDialog.js CHANGED
@@ -18,8 +18,9 @@ const useUserSurveyDialog = (withoutTimer = false) => {
18
18
  ? Date.now() - Number.parseInt(sessionStore.surveyTimerStart)
19
19
  : 0;
20
20
  const isShowSurvey = !isSurveySkipped &&
21
+ !isOtherLanguagePortal &&
21
22
  (!userSurveyStore.userSurvey || userSurveyStore.userSurvey?.nextDueAt <= Date.now());
22
- const handleCloseSurvey = (0, hooks_1.useCallback)(() => {
23
+ const handleSkipSurvey = (0, hooks_1.useCallback)(() => {
23
24
  sessionStore.isSurveySkipped = true;
24
25
  }, []);
25
26
  const openUserSurveyDialog = (0, hooks_1.useCallback)((isAfterTargetAction = false) => {
@@ -28,7 +29,7 @@ const useUserSurveyDialog = (withoutTimer = false) => {
28
29
  $ref: '/wcms-resources/user-survey-reasons.json',
29
30
  },
30
31
  isAfterTargetAction,
31
- onClose: handleCloseSurvey,
32
+ onSkip: handleSkipSurvey,
32
33
  });
33
34
  }, []);
34
35
  const handleOpenSurveyAction = (0, hooks_1.useCallback)(() => {
@@ -57,4 +58,8 @@ const useUserSurveyDialog = (withoutTimer = false) => {
57
58
  return handleOpenSurveyAction;
58
59
  };
59
60
  exports.useUserSurveyDialog = useUserSurveyDialog;
61
+ const isOtherLanguagePortal = () => {
62
+ const regexp = new RegExp('^/(cn|en)($|/.*)');
63
+ return regexp.test(globalThis.location.pathname);
64
+ };
60
65
  //# sourceMappingURL=useUserSurveyDialog.js.map
package/mobile/dist/ui-kit/UserSurveyDialog/useUserSurveyDialog.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useUserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/useUserSurveyDialog.ts"],"names":[],"mappings":";;AAAA,uDAAqE;AACrE,6EAA0E;AAC1E,iFAA8E;AAC9E,2CAAwC;AACxC,0DAAuD;AACvD,yDAAsD;AAGtD,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAQ5B,4CAA4C;AACrC,MAAM,mBAAmB,GAAG,CAAC,YAAY,GAAG,KAAK,EAAE,EAAE;IAC1D,MAAM,gBAAgB,GAAG,IAAA,qBAAS,EAAC,mCAAgB,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,IAAA,6BAAa,GAAwB,CAAC;IAC9D,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAoB,CAAC;IACzD,MAAM,WAAW,GAAG,YAAY,CAAC,aAAa,CAAC;IAC/C,MAAM,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;IACrD,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB;QAC/C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,gBAAgB,CAAC;QAC7D,CAAC,CAAC,CAAC,CAAC;IACN,MAAM,YAAY,GAChB,CAAC,eAAe;QAChB,CAAC,CAAC,eAAe,CAAC,UAAU,IAAI,eAAe,CAAC,UAAU,EAAE,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAEvF,MAAM,iBAAiB,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACzC,YAAY,CAAC,eAAe,GAAG,IAAI,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EAAC,CAAC,mBAAmB,GAAG,KAAK,EAAE,EAAE;QACvE,gBAAgB,CAAC,IAAI,CAAC;YACpB,aAAa,EAAE;gBACb,IAAI,EAAE,0CAA0C;aACjD;YACD,mBAAmB;YACnB,OAAO,EAAE,iBAAiB;SAC3B,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,sBAAsB,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAC9C,IAAI,YAAY,EAAE;YAChB,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;YACzC,oBAAoB,CAAC,IAAI,CAAC,CAAC;SAC5B;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IAEhC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,0GAA0G;QAC1G,IAAI,CAAC,YAAY,IAAI,YAAY,EAAE;YACjC,uDAAuD;YACvD,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE;gBAClC,YAAY,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;aACvD;YACD,wDAAwD;YACxD,MAAM,OAAO,GAAG,UAAU,CAAC,oBAAoB,EAAE,KAAK,GAAG,WAAW,CAAC,CAAC;YACtE,YAAY,CAAC,aAAa,GAAG,OAAO,CAAC;YAErC,OAAO,GAAG,EAAE;gBACV,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC;YACpC,CAAC,CAAC;SACH;QAED,OAAO,WAAI,CAAC;IACd,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO,sBAAsB,CAAC;AAChC,CAAC,CAAC;AAvDW,QAAA,mBAAmB,uBAuD9B"}
1
+ {"version":3,"file":"useUserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/useUserSurveyDialog.ts"],"names":[],"mappings":";;AAAA,uDAAqE;AACrE,6EAA0E;AAC1E,iFAA8E;AAC9E,2CAAwC;AACxC,0DAAuD;AACvD,yDAAsD;AAGtD,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAQ5B,4CAA4C;AACrC,MAAM,mBAAmB,GAAG,CAAC,YAAY,GAAG,KAAK,EAAE,EAAE;IAC1D,MAAM,gBAAgB,GAAG,IAAA,qBAAS,EAAC,mCAAgB,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,IAAA,6BAAa,GAAwB,CAAC;IAC9D,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAoB,CAAC;IACzD,MAAM,WAAW,GAAG,YAAY,CAAC,aAAa,CAAC;IAC/C,MAAM,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;IACrD,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB;QAC/C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,gBAAgB,CAAC;QAC7D,CAAC,CAAC,CAAC,CAAC;IACN,MAAM,YAAY,GAChB,CAAC,eAAe;QAChB,CAAC,qBAAqB;QACtB,CAAC,CAAC,eAAe,CAAC,UAAU,IAAI,eAAe,CAAC,UAAU,EAAE,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAEvF,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACxC,YAAY,CAAC,eAAe,GAAG,IAAI,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EAAC,CAAC,mBAAmB,GAAG,KAAK,EAAE,EAAE;QACvE,gBAAgB,CAAC,IAAI,CAAC;YACpB,aAAa,EAAE;gBACb,IAAI,EAAE,0CAA0C;aACjD;YACD,mBAAmB;YACnB,MAAM,EAAE,gBAAgB;SACzB,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,sBAAsB,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAC9C,IAAI,YAAY,EAAE;YAChB,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;YACzC,oBAAoB,CAAC,IAAI,CAAC,CAAC;SAC5B;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IAEhC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,0GAA0G;QAC1G,IAAI,CAAC,YAAY,IAAI,YAAY,EAAE;YACjC,uDAAuD;YACvD,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE;gBAClC,YAAY,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;aACvD;YACD,wDAAwD;YACxD,MAAM,OAAO,GAAG,UAAU,CAAC,oBAAoB,EAAE,KAAK,GAAG,WAAW,CAAC,CAAC;YACtE,YAAY,CAAC,aAAa,GAAG,OAAO,CAAC;YAErC,OAAO,GAAG,EAAE;gBACV,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC;YACpC,CAAC,CAAC;SACH;QAED,OAAO,WAAI,CAAC;IACd,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO,sBAAsB,CAAC;AAChC,CAAC,CAAC;AAxDW,QAAA,mBAAmB,uBAwD9B;AAEF,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACjC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAE9C,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACnD,CAAC,CAAC"}
package/mobile/lib/ui-kit/UserSurveyDialog/UserSurveyDialog.js CHANGED
@@ -11,7 +11,7 @@ import { FirstStep } from './FirstStep.js';
11
11
  import { SecondStep } from './SecondStep.js';
12
12
  const STEPS = [FirstStep, SecondStep, FinalStep];
13
13
  const LAST_STEP_INDEX = 2;
14
- export const UserSurveyDialog = UniBlock(({ onClose = noop, isAfterTargetAction = false, reasonsSource = {} }) => {
14
+ export const UserSurveyDialog = UniBlock(({ onClose = noop, isAfterTargetAction = false, reasonsSource = {}, onSkip = noop }) => {
15
15
  const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
16
16
  const [currentRating, setCurrentRating] = useState(0);
17
17
  const [currentReason, setCurrentReason] = useState();
@@ -40,7 +40,13 @@ export const UserSurveyDialog = UniBlock(({ onClose = noop, isAfterTargetAction
40
40
  };
41
41
  setStep(LAST_STEP_INDEX);
42
42
  }, [currentRating, currentReason]);
43
- return (_jsx(Dialog, { maxWidth: "xl", onClose: onClose, children: _jsx(ActiveStep, { currentRating: currentRating, currentReason: currentReason, reasons: reasons, surveyType: surveyType, isSending: isSending, setCurrentReason: setCurrentReason, setCurrentRating: setCurrentRating, onSubmit: handleSubmit, onNextStep: handleNextStep }) }));
43
+ const handleClose = useCallback(() => {
44
+ if (step !== LAST_STEP_INDEX) {
45
+ onSkip();
46
+ }
47
+ onClose();
48
+ }, [step]);
49
+ return (_jsx(Dialog, { maxWidth: "xl", onClose: handleClose, children: _jsx(ActiveStep, { currentRating: currentRating, currentReason: currentReason, reasons: reasons, surveyType: surveyType, isSending: isSending, setCurrentReason: setCurrentReason, setCurrentRating: setCurrentRating, onSubmit: handleSubmit, onNextStep: handleNextStep }) }));
44
50
  });
45
51
  const getMessage = (currentReason, message) => {
46
52
  if (currentReason?.text !== 'Другое') {
@@ -52,7 +58,6 @@ const getMessage = (currentReason, message) => {
52
58
  const getTimeAfter30days = () => Date.now() + 30 * 24 * 60 * 60 * 1000;
53
59
  // Если пользователь проходил опрос то показываем другой, иначе показываем случайный тип опроса
54
60
  const getUserSurveyType = (lastShownType) => {
55
- console.log('Расчитал');
56
61
  if (lastShownType) {
57
62
  return lastShownType === 'NPS' ? 'CSI' : 'NPS';
58
63
  }
package/mobile/lib/ui-kit/UserSurveyDialog/UserSurveyDialog.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/UserSurveyDialog.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/UserSurveyDialog.tsx"],"names":[],"mappings":"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"}
package/mobile/lib/ui-kit/UserSurveyDialog/UserSurveyDialogContent.d.ts CHANGED
@@ -28,4 +28,5 @@ export interface UserSurveyDialogContent extends OnCloseProps, UniBlockContent {
28
28
  reasons: Reason[];
29
29
  } | JSONRefObject;
30
30
  isAfterTargetAction?: boolean;
31
+ onSkip?: () => void;
31
32
  }
package/mobile/lib/ui-kit/UserSurveyDialog/useUserSurveyDialog.js CHANGED
@@ -16,8 +16,9 @@ export const useUserSurveyDialog = (withoutTimer = false) => {
16
16
  ? Date.now() - Number.parseInt(sessionStore.surveyTimerStart)
17
17
  : 0;
18
18
  const isShowSurvey = !isSurveySkipped &&
19
+ !isOtherLanguagePortal &&
19
20
  (!userSurveyStore.userSurvey || userSurveyStore.userSurvey?.nextDueAt <= Date.now());
20
- const handleCloseSurvey = useCallback(() => {
21
+ const handleSkipSurvey = useCallback(() => {
21
22
  sessionStore.isSurveySkipped = true;
22
23
  }, []);
23
24
  const openUserSurveyDialog = useCallback((isAfterTargetAction = false) => {
@@ -26,7 +27,7 @@ export const useUserSurveyDialog = (withoutTimer = false) => {
26
27
  $ref: '/wcms-resources/user-survey-reasons.json',
27
28
  },
28
29
  isAfterTargetAction,
29
- onClose: handleCloseSurvey,
30
+ onSkip: handleSkipSurvey,
30
31
  });
31
32
  }, []);
32
33
  const handleOpenSurveyAction = useCallback(() => {
@@ -54,4 +55,8 @@ export const useUserSurveyDialog = (withoutTimer = false) => {
54
55
  }, [isShowSurvey]);
55
56
  return handleOpenSurveyAction;
56
57
  };
58
+ const isOtherLanguagePortal = () => {
59
+ const regexp = new RegExp('^/(cn|en)($|/.*)');
60
+ return regexp.test(globalThis.location.pathname);
61
+ };
57
62
  //# sourceMappingURL=useUserSurveyDialog.js.map
package/mobile/lib/ui-kit/UserSurveyDialog/useUserSurveyDialog.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useUserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/useUserSurveyDialog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAQ5B,4CAA4C;AAC5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,YAAY,GAAG,KAAK,EAAE,EAAE;IAC1D,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,aAAa,EAAwB,CAAC;IAC9D,MAAM,YAAY,GAAG,eAAe,EAAoB,CAAC;IACzD,MAAM,WAAW,GAAG,YAAY,CAAC,aAAa,CAAC;IAC/C,MAAM,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;IACrD,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB;QAC/C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,gBAAgB,CAAC;QAC7D,CAAC,CAAC,CAAC,CAAC;IACN,MAAM,YAAY,GAChB,CAAC,eAAe;QAChB,CAAC,CAAC,eAAe,CAAC,UAAU,IAAI,eAAe,CAAC,UAAU,EAAE,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAEvF,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;QACzC,YAAY,CAAC,eAAe,GAAG,IAAI,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,oBAAoB,GAAG,WAAW,CAAC,CAAC,mBAAmB,GAAG,KAAK,EAAE,EAAE;QACvE,gBAAgB,CAAC,IAAI,CAAC;YACpB,aAAa,EAAE;gBACb,IAAI,EAAE,0CAA0C;aACjD;YACD,mBAAmB;YACnB,OAAO,EAAE,iBAAiB;SAC3B,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,sBAAsB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC9C,IAAI,YAAY,EAAE;YAChB,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;YACzC,oBAAoB,CAAC,IAAI,CAAC,CAAC;SAC5B;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IAEhC,SAAS,CAAC,GAAG,EAAE;QACb,0GAA0G;QAC1G,IAAI,CAAC,YAAY,IAAI,YAAY,EAAE;YACjC,uDAAuD;YACvD,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE;gBAClC,YAAY,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;aACvD;YACD,wDAAwD;YACxD,MAAM,OAAO,GAAG,UAAU,CAAC,oBAAoB,EAAE,KAAK,GAAG,WAAW,CAAC,CAAC;YACtE,YAAY,CAAC,aAAa,GAAG,OAAO,CAAC;YAErC,OAAO,GAAG,EAAE;gBACV,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC;YACpC,CAAC,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO,sBAAsB,CAAC;AAChC,CAAC,CAAC"}
1
+ {"version":3,"file":"useUserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/useUserSurveyDialog.ts"],"names":[],"mappings":"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"}
package/mobile/src/ui-kit/UserSurveyDialog/UserSurveyDialog.tsx CHANGED
@@ -21,7 +21,7 @@ const STEPS = [FirstStep, SecondStep, FinalStep];
21
21
  const LAST_STEP_INDEX = 2;
22
22
 
23
23
  export const UserSurveyDialog = UniBlock<UserSurveyDialogProps>(
24
- ({ onClose = noop, isAfterTargetAction = false, reasonsSource = {} }) => {
24
+ ({ onClose = noop, isAfterTargetAction = false, reasonsSource = {}, onSkip = noop }) => {
25
25
  const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
26
26
  const [currentRating, setCurrentRating] = useState<number>(0);
27
27
  const [currentReason, setCurrentReason] = useState<Reason>();
@@ -59,8 +59,15 @@ export const UserSurveyDialog = UniBlock<UserSurveyDialogProps>(
59
59
  [currentRating, currentReason],
60
60
  );
61
61
 
62
+ const handleClose = useCallback(() => {
63
+ if (step !== LAST_STEP_INDEX) {
64
+ onSkip();
65
+ }
66
+ onClose();
67
+ }, [step]);
68
+
62
69
  return (
63
- <Dialog maxWidth="xl" onClose={onClose}>
70
+ <Dialog maxWidth="xl" onClose={handleClose}>
64
71
  <ActiveStep
65
72
  currentRating={currentRating}
66
73
  currentReason={currentReason}
@@ -90,7 +97,6 @@ const getTimeAfter30days = () => Date.now() + 30 * 24 * 60 * 60 * 1000;
90
97
 
91
98
  // Если пользователь проходил опрос то показываем другой, иначе показываем случайный тип опроса
92
99
  const getUserSurveyType = (lastShownType?: UserSurveyType) => {
93
- console.log('Расчитал');
94
100
  if (lastShownType) {
95
101
  return lastShownType === 'NPS' ? 'CSI' : 'NPS';
96
102
  }
package/mobile/src/ui-kit/UserSurveyDialog/UserSurveyDialogContent.ts CHANGED
@@ -31,4 +31,5 @@ export type StepProps = {
31
31
  export interface UserSurveyDialogContent extends OnCloseProps, UniBlockContent {
32
32
  reasonsSource?: { reasons: Reason[] } | JSONRefObject;
33
33
  isAfterTargetAction?: boolean;
34
+ onSkip?: () => void;
34
35
  }
package/mobile/src/ui-kit/UserSurveyDialog/useUserSurveyDialog.ts CHANGED
@@ -26,9 +26,10 @@ export const useUserSurveyDialog = (withoutTimer = false) => {
26
26
  : 0;
27
27
  const isShowSurvey =
28
28
  !isSurveySkipped &&
29
+ !isOtherLanguagePortal &&
29
30
  (!userSurveyStore.userSurvey || userSurveyStore.userSurvey?.nextDueAt <= Date.now());
30
31
 
31
- const handleCloseSurvey = useCallback(() => {
32
+ const handleSkipSurvey = useCallback(() => {
32
33
  sessionStore.isSurveySkipped = true;
33
34
  }, []);
34
35
 
@@ -38,7 +39,7 @@ export const useUserSurveyDialog = (withoutTimer = false) => {
38
39
  $ref: '/wcms-resources/user-survey-reasons.json',
39
40
  },
40
41
  isAfterTargetAction,
41
- onClose: handleCloseSurvey,
42
+ onSkip: handleSkipSurvey,
42
43
  });
43
44
  }, []);
44
45
 
@@ -71,3 +72,9 @@ export const useUserSurveyDialog = (withoutTimer = false) => {
71
72
 
72
73
  return handleOpenSurveyAction;
73
74
  };
75
+
76
+ const isOtherLanguagePortal = () => {
77
+ const regexp = new RegExp('^/(cn|en)($|/.*)');
78
+
79
+ return regexp.test(globalThis.location.pathname);
80
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@redneckz/wildless-cms-uni-blocks",
3
- "version": "0.14.1024",
3
+ "version": "0.14.1026",
4
4
  "private": false,
5
5
  "license": "MIT",
6
6
  "author": "ЦК",
package/src/ui-kit/UserSurveyDialog/UserSurveyDialog.tsx CHANGED
@@ -21,7 +21,7 @@ const STEPS = [FirstStep, SecondStep, FinalStep];
21
21
  const LAST_STEP_INDEX = 2;
22
22
 
23
23
  export const UserSurveyDialog = UniBlock<UserSurveyDialogProps>(
24
- ({ onClose = noop, isAfterTargetAction = false, reasonsSource = {} }) => {
24
+ ({ onClose = noop, isAfterTargetAction = false, reasonsSource = {}, onSkip = noop }) => {
25
25
  const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
26
26
  const [currentRating, setCurrentRating] = useState<number>(0);
27
27
  const [currentReason, setCurrentReason] = useState<Reason>();
@@ -59,8 +59,15 @@ export const UserSurveyDialog = UniBlock<UserSurveyDialogProps>(
59
59
  [currentRating, currentReason],
60
60
  );
61
61
 
62
+ const handleClose = useCallback(() => {
63
+ if (step !== LAST_STEP_INDEX) {
64
+ onSkip();
65
+ }
66
+ onClose();
67
+ }, [step]);
68
+
62
69
  return (
63
- <Dialog maxWidth="xl" onClose={onClose}>
70
+ <Dialog maxWidth="xl" onClose={handleClose}>
64
71
  <ActiveStep
65
72
  currentRating={currentRating}
66
73
  currentReason={currentReason}
@@ -90,7 +97,6 @@ const getTimeAfter30days = () => Date.now() + 30 * 24 * 60 * 60 * 1000;
90
97
 
91
98
  // Если пользователь проходил опрос то показываем другой, иначе показываем случайный тип опроса
92
99
  const getUserSurveyType = (lastShownType?: UserSurveyType) => {
93
- console.log('Расчитал');
94
100
  if (lastShownType) {
95
101
  return lastShownType === 'NPS' ? 'CSI' : 'NPS';
96
102
  }
package/src/ui-kit/UserSurveyDialog/UserSurveyDialogContent.ts CHANGED
@@ -31,4 +31,5 @@ export type StepProps = {
31
31
  export interface UserSurveyDialogContent extends OnCloseProps, UniBlockContent {
32
32
  reasonsSource?: { reasons: Reason[] } | JSONRefObject;
33
33
  isAfterTargetAction?: boolean;
34
+ onSkip?: () => void;
34
35
  }
package/src/ui-kit/UserSurveyDialog/useUserSurveyDialog.ts CHANGED
@@ -26,9 +26,10 @@ export const useUserSurveyDialog = (withoutTimer = false) => {
26
26
  : 0;
27
27
  const isShowSurvey =
28
28
  !isSurveySkipped &&
29
+ !isOtherLanguagePortal &&
29
30
  (!userSurveyStore.userSurvey || userSurveyStore.userSurvey?.nextDueAt <= Date.now());
30
31
 
31
- const handleCloseSurvey = useCallback(() => {
32
+ const handleSkipSurvey = useCallback(() => {
32
33
  sessionStore.isSurveySkipped = true;
33
34
  }, []);
34
35
 
@@ -38,7 +39,7 @@ export const useUserSurveyDialog = (withoutTimer = false) => {
38
39
  $ref: '/wcms-resources/user-survey-reasons.json',
39
40
  },
40
41
  isAfterTargetAction,
41
- onClose: handleCloseSurvey,
42
+ onSkip: handleSkipSurvey,
42
43
  });
43
44
  }, []);
44
45
 
@@ -71,3 +72,9 @@ export const useUserSurveyDialog = (withoutTimer = false) => {
71
72
 
72
73
  return handleOpenSurveyAction;
73
74
  };
75
+
76
+ const isOtherLanguagePortal = () => {
77
+ const regexp = new RegExp('^/(cn|en)($|/.*)');
78
+
79
+ return regexp.test(globalThis.location.pathname);
80
+ };