@cdc/markup-include 4.25.3-6 → 4.25.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdc/markup-include",
-  "version": "4.25.3-6",
+  "version": "4.25.3",
   "description": "React component for displaying HTML content from an outside link",
   "moduleName": "CdcMarkupInclude",
   "main": "dist/cdcmarkupinclude",
@@ -27,7 +27,7 @@
   "license": "Apache-2.0",
   "homepage": "https://github.com/CDCgov/cdc-open-viz#readme",
   "dependencies": {
-    "@cdc/core": "^4.25.3-6",
+    "@cdc/core": "^4.25.3",
     "axios": "^1.6.0",
     "chroma": "0.0.1",
     "chroma-js": "^2.1.0",
@@ -39,5 +39,5 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
-  "gitHead": "d83d8555c1500ff0cad9d2c5c3486324afa15ec6"
+  "gitHead": "b09566f5a7d57c8d0109e5f407257729d6b36846"
 }

package/src/CdcMarkupInclude.tsx

@@ -75,7 +75,7 @@ const CdcMarkupInclude: React.FC<CdcMarkupIncludeProps> = ({
     dispatch({ type: 'SET_CONFIG', payload: newConfig })
   }
 
-  const loadConfig = useCallback(async () => {
+  const loadConfig = async () => {
     let response = configObj || (await (await fetch(configUrl)).json())
     let responseData = response.data ?? {}
 
@@ -89,7 +89,7 @@ const CdcMarkupInclude: React.FC<CdcMarkupIncludeProps> = ({
 
     updateConfig({ ...configObj, ...processedConfig })
     dispatch({ type: 'SET_LOADING', payload: false })
-  }, [])
+  }
 
   // Custom Functions
   useEffect(() => {
@@ -116,7 +116,7 @@ const CdcMarkupInclude: React.FC<CdcMarkupIncludeProps> = ({
     }
   }, [markupError])
 
-  const loadConfigMarkupData = useCallback(async () => {
+  const loadConfigMarkupData = async () => {
     dispatch({ type: 'SET_MARKUP_ERROR', payload: null })
 
     if (srcUrl) {
@@ -147,7 +147,7 @@ const CdcMarkupInclude: React.FC<CdcMarkupIncludeProps> = ({
     } else {
       dispatch({ type: 'SET_URL_MARKUP', payload: '' })
     }
-  }, [srcUrl])
+  }
 
   const filterOutConditions = (workingData, conditionList) => {
     const { columnName, isOrIsNotEqualTo, value } = conditionList[0]
@@ -212,11 +212,12 @@ const CdcMarkupInclude: React.FC<CdcMarkupIncludeProps> = ({
     let parse
     let hasBody = false
     if (markup && markup !== '' && markup !== null) {
-      if (markup.toString().match(/<body[^>]*>/i) && markup.toString().match(/<\/body\s*>/i)) {
+      const markupString = markup.toString()
+      if (markupString.match(/<body[^>]*>/i) && markupString.match(/<\/body\s*>/i)) {
         hasBody = true
-        parse = markup.toString().match(/<body[^>]*>([^<]*(?:(?!<\/?body)<[^<]*)*)<\/body\s*>/i)
+        parse = markupString.match(/<body[^>]*>([^<]*(?:(?!<\/?body)<[^<]*)*)<\/body\s*>/i)
       } else {
-        parse = markup.toString()
+        parse = markupString
       }
     }
 
@@ -239,7 +240,7 @@ const CdcMarkupInclude: React.FC<CdcMarkupIncludeProps> = ({
   //Reload any functions when config is updated
   useEffect(() => {
     loadConfigMarkupData().catch(err => console.log(err))
-  }, [loadConfigMarkupData])
+  }, [config])
 
   let content = <Loading />
 

package/src/components/EditorPanel.tsx

@@ -73,7 +73,7 @@ const EditorPanel: React.FC = () => {
   }
 
   const convertStateToConfig = () => {
-    const strippedState = JSON.parse(JSON.stringify(config))
+    const strippedState = _.cloneDeep(config)
     delete strippedState.newViz
     delete strippedState.runtime