@rpg-engine/long-bow 0.8.52 → 0.8.53

package/dist/components/DailyTasks/DailyTasks.d.ts

@@ -1,8 +1,8 @@
-import { ICharacterDailyTask, ICollectGlobalRewardRequest, ITaskIdentifier } from '@rpg-engine/shared';
+import { ICharacterDailyTask, ICollectGlobalRewardRequest, ICollectRewardRequest } from '@rpg-engine/shared';
 import React from 'react';
 export interface IDailyTasksProps {
     tasks: ICharacterDailyTask[];
-    onClaimReward: (task: ITaskIdentifier) => void;
+    onClaimReward: (task: ICollectRewardRequest) => void;
     onClaimGlobalReward: (tasks: ICollectGlobalRewardRequest) => void;
     onClose: () => void;
     scale?: number;
@@ -10,5 +10,6 @@ export interface IDailyTasksProps {
     itemsAtlasIMG: string;
     iconAtlasJSON?: Record<string, any>;
     iconAtlasIMG?: string;
+    globalRewardClaimed?: boolean;
 }
 export declare const DailyTasks: React.FC<IDailyTasksProps>;

package/dist/long-bow.cjs.development.js

@@ -29313,40 +29313,6 @@ var EmptyState = /*#__PURE__*/styled__default.div.withConfig({
   componentId: "sc-19q95ue-15"
 })(["position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);display:flex;flex-direction:column;align-items:center;justify-content:center;text-align:center;color:", ";width:100%;padding:2rem;svg{font-size:3rem;margin-bottom:1rem;opacity:0.7;}p{font-family:'Press Start 2P',cursive;font-size:0.9rem;margin:0;}"], uiColors.lightGray);
 
-function useDailyTasksState(_ref) {
-  var onClaimReward = _ref.onClaimReward,
-    onClaimGlobalReward = _ref.onClaimGlobalReward;
-  var _useState = React.useState(false),
-    globalRewardClaimed = _useState[0],
-    setGlobalRewardClaimed = _useState[1];
-  var _useState2 = React.useState([]),
-    claimedTaskKeys = _useState2[0],
-    setClaimedTaskKeys = _useState2[1];
-  var handleClaimReward = function handleClaimReward(taskKey, type) {
-    onClaimReward({
-      type: type,
-      taskKey: taskKey
-    });
-    setClaimedTaskKeys(function (prev) {
-      return [].concat(prev, [taskKey]);
-    });
-  };
-  var handleClaimGlobalRewards = function handleClaimGlobalRewards(tasks) {
-    onClaimGlobalReward(tasks);
-    setGlobalRewardClaimed(true);
-  };
-  var isTaskRewardClaimed = function isTaskRewardClaimed(taskKey) {
-    return claimedTaskKeys.includes(taskKey);
-  };
-  return {
-    globalRewardClaimed: globalRewardClaimed,
-    claimedTaskKeys: claimedTaskKeys,
-    isTaskRewardClaimed: isTaskRewardClaimed,
-    handleClaimReward: handleClaimReward,
-    handleClaimGlobalRewards: handleClaimGlobalRewards
-  };
-}
-
 var formatTaskKey = function formatTaskKey(key) {
   var formatted = key.replace(/[-_]/g, ' ');
   formatted = formatted.replace(/([A-Z])/g, ' $1');
@@ -29744,6 +29710,7 @@ var GlobalDailyProgress = function GlobalDailyProgress(_ref) {
     return task.claimed === true;
   });
   var shouldShowGlobalButton = allCompleted && allClaimed && !globalRewardClaimed;
+  var shouldShowClaimedMessage = globalRewardClaimed;
   var handleClaimAll = function handleClaimAll() {
     var taskIdentifiers = tasks.map(function (task) {
       return {
@@ -29757,10 +29724,10 @@ var GlobalDailyProgress = function GlobalDailyProgress(_ref) {
   };
   return React__default.createElement(GlobalProgressContainer, null, React__default.createElement(HeaderContainer$1, null, React__default.createElement(GlobeIcon, null, "\uD83C\uDF0D"), React__default.createElement(ProgressText, null, "Global Tasks Completed: ", completedTasks, "/", totalTasks)), React__default.createElement(ProgressBar, null, React__default.createElement(ProgressFill, {
     percentage: completedTasks / totalTasks * 100
-  })), allCompleted && React__default.createElement(React__default.Fragment, null, shouldShowGlobalButton ? React__default.createElement(CollectWrapper$1, null, React__default.createElement(Button, {
+  })), allCompleted && React__default.createElement(React__default.Fragment, null, shouldShowGlobalButton && React__default.createElement(CollectWrapper$1, null, React__default.createElement(Button, {
     buttonType: exports.ButtonTypes.RPGUIButton,
     onPointerDown: handleClaimAll
-  }, "Collect Global Rewards")) : React__default.createElement(ClaimedText$1, null, "Global Rewards Claimed")));
+  }, "Collect Global Rewards")), shouldShowClaimedMessage && React__default.createElement(ClaimedText$1, null, "Global Rewards Claimed")));
 };
 var GlobalProgressContainer = /*#__PURE__*/styled__default.div.withConfig({
   displayName: "GlobalDailyProgress__GlobalProgressContainer",
@@ -29807,18 +29774,34 @@ var DailyTasks = function DailyTasks(_ref) {
     itemsAtlasJSON = _ref.itemsAtlasJSON,
     itemsAtlasIMG = _ref.itemsAtlasIMG,
     iconAtlasJSON = _ref.iconAtlasJSON,
-    iconAtlasIMG = _ref.iconAtlasIMG;
+    iconAtlasIMG = _ref.iconAtlasIMG,
+    _ref$globalRewardClai = _ref.globalRewardClaimed,
+    globalRewardClaimed = _ref$globalRewardClai === void 0 ? false : _ref$globalRewardClai;
   var _React$useState = React__default.useState(tasks),
     localTasks = _React$useState[0];
   var size = useResponsiveSize(scale);
-  var _useDailyTasksState = useDailyTasksState({
-      onClaimReward: onClaimReward,
-      onClaimGlobalReward: onClaimGlobalReward
-    }),
-    globalRewardClaimed = _useDailyTasksState.globalRewardClaimed,
-    handleClaimReward = _useDailyTasksState.handleClaimReward,
-    handleClaimGlobalRewards = _useDailyTasksState.handleClaimGlobalRewards,
-    isTaskRewardClaimed = _useDailyTasksState.isTaskRewardClaimed;
+  var _useState = React.useState([]),
+    claimedTasks = _useState[0],
+    setClaimedTasks = _useState[1];
+  var _useState2 = React.useState(false),
+    globalRewardClaimedLocal = _useState2[0],
+    setGlobalRewardClaimedLocal = _useState2[1];
+  var handleClaimReward = function handleClaimReward(taskKey, taskType) {
+    onClaimReward({
+      taskKey: taskKey,
+      type: taskType
+    });
+    setClaimedTasks(function (prev) {
+      return [].concat(prev, [taskKey]);
+    });
+  };
+  var handleClaimGlobalRewards = function handleClaimGlobalRewards(tasks) {
+    onClaimGlobalReward(tasks);
+    setGlobalRewardClaimedLocal(true);
+  };
+  var isTaskRewardClaimed = function isTaskRewardClaimed(taskKey) {
+    return claimedTasks.includes(taskKey);
+  };
   if (!size) return null;
   return React__default.createElement(TasksContainer, {
     type: exports.RPGUIContainerTypes.Framed,
@@ -29832,7 +29815,7 @@ var DailyTasks = function DailyTasks(_ref) {
   }, React__default.createElement(GlobalDailyProgress, {
     tasks: localTasks,
     onClaimAllRewards: handleClaimGlobalRewards,
-    globalRewardClaimed: globalRewardClaimed
+    globalRewardClaimed: globalRewardClaimed || globalRewardClaimedLocal
   }), localTasks.map(function (task) {
     return React__default.createElement(DailyTaskItem, {
       key: task.key,
@@ -29843,7 +29826,7 @@ var DailyTasks = function DailyTasks(_ref) {
       itemsAtlasIMG: itemsAtlasIMG,
       iconAtlasJSON: iconAtlasJSON,
       iconAtlasIMG: iconAtlasIMG,
-      isRewardClaimed: isTaskRewardClaimed(task.key)
+      isRewardClaimed: task.claimed || isTaskRewardClaimed(task.key)
     });
   }))));
 };