@vonaffenfels/contentful-teasermanager 1.2.1 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vonaffenfels/contentful-teasermanager",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "main": "dist/index.js",
     "scripts": {
         "prepublish": "yarn run build",
@@ -101,7 +101,7 @@
         "contentful-resolve-response": "^1.9.2",
         "webpack": "5.88.2"
     },
-    "gitHead": "b06b79ed032fecf1dfeef2e7e312eb0d42f2e84e",
+    "gitHead": "1e99cab528da01b06334b55df31f21305222e6b8",
     "publishConfig": {
         "access": "public"
     }

package/src/components/Contentful/Dialog/LogicEditor.js

@@ -53,10 +53,7 @@ export const LogicEditor = (props) => {
 const LogicEditorInner = ({
     onSave = () => alert("onSave missing"),
     sdk,
-    logicData = {
-        timepoints: [7, 12, 18],
-        tags: [],
-    },
+    logicData,
     selectedTags,
     setSelectedTags,
 }) => {
@@ -69,8 +66,12 @@ const LogicEditorInner = ({
     const debouncedSearch = useDebounce(searchQuery, 500);
     const [selectedTimepoints, setSelectedTimepoints] = useState([]);
     useEffect(() => {
-        setSelectedTimepoints(logicData?.timepoints || []);
-    }, [logicData?.timepoints]);
+        if (logicData?.timepoints) {
+            setSelectedTimepoints(logicData?.timepoints);
+        } else {
+            setSelectedTimepoints([7, 12, 18]);
+        }
+    }, [logicData]);
     const {
         setNodeRef: setOrNodeRef,
         isOver: isOrOver,
@@ -265,11 +266,16 @@ const LogicEditorInner = ({
                         return (
                             <Checkbox
                                 key={category.id}
-                                isChecked={selectedTags.some((t) => category.tags.some((c) => c.id === t.id))}
+                                isChecked={selectedTags.some((t) => category.tags.some((c) => c.id === t.id) || t.id === category.id)}
                                 onChange={(e) => {
                                     let newTags = [...selectedTags];
 
                                     if (e.target.checked) {
+                                        newTags.push({
+                                            label: category.title,
+                                            id: category.id,
+                                            type: "or",
+                                        });
                                         for (const tag of category.tags) {
                                             if (!selectedTags.find((t) => t.id === tag.id)) {
                                                 newTags.push({
@@ -280,6 +286,8 @@ const LogicEditorInner = ({
                                             }
                                         }
                                     } else {
+                                        newTags = newTags.filter((t) => t.id !== category.id);
+
                                         for (const tag of category.tags) {
                                             newTags = newTags.filter((t) => t.id !== tag.id);
                                         }
@@ -288,7 +296,8 @@ const LogicEditorInner = ({
                                     setSelectedTags(newTags);
                                 }}
                             >
-                                {category.title} ({selectedTags.filter((t) => category.tags.some((c) => c.id === t.id)).length}/{category.tags.length})
+                                {category.title} ({selectedTags.filter((t) =>
+                                    category.tags.some((c) => c.id === t.id) || t.id === category.id).length}/{category.tags.length + 1})
                             </Checkbox>
                         );
                     })}