@tinacms/app 0.0.0-20230516185052 → 0.0.0-20230516194926

package/CHANGELOG.md

@@ -1,14 +1,14 @@
 # @tinacms/app
 
-## 0.0.0-20230516185052
+## 0.0.0-20230516194926
 
 ### Patch Changes
 
 - 7f95c1ce5: Reorganize the way fields are presented on the form to allow for deep-linking
 - Updated dependencies [b3d98d159]
 - Updated dependencies [7f95c1ce5]
-  - @tinacms/toolkit@0.0.0-20230516185052
-  - tinacms@0.0.0-20230516185052
+  - @tinacms/toolkit@0.0.0-20230516194926
+  - tinacms@0.0.0-20230516194926
 
 ## 1.2.12
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/app",
-  "version": "0.0.0-20230516185052",
+  "version": "0.0.0-20230516194926",
   "main": "src/main.tsx",
   "license": "Apache-2.0",
   "devDependencies": {
@@ -28,7 +28,7 @@
     "typescript": "^4.6.4",
     "zod": "^3.14.3",
     "@tinacms/mdx": "1.3.10",
-    "@tinacms/toolkit": "0.0.0-20230516185052",
-    "tinacms": "0.0.0-20230516185052"
+    "@tinacms/toolkit": "0.0.0-20230516194926",
+    "tinacms": "0.0.0-20230516194926"
   }
 }

package/src/lib/graphql-reducer.ts

@@ -179,11 +179,6 @@ export const useGraphQLReducer = (
   >([])
   const [operationIndex, setOperationIndex] = React.useState(0)
 
-  const helper = React.useMemo(() => {
-    const previewPlugins = cms.plugins.getType('preview-helper')
-    return previewPlugins.find('preview-helper')
-  }, [cms])
-
   React.useEffect(() => {
     const run = async () => {
       return Promise.all(
@@ -412,14 +407,6 @@ export const useGraphQLReducer = (
               )
             }
           }
-          if (typeof value === 'string' && source?._tina_metadata) {
-            // FIXME: hack to prevent breaking images
-            if (helper) {
-              const pathArray = G.responsePathAsArray(info.path)
-
-              return helper.encode(pathArray.join('.'), value, payload.id)
-            }
-          }
           return value
         },
       })
@@ -444,7 +431,7 @@ export const useGraphQLReducer = (
       } else {
         if (result.data) {
           setResults((results) => [
-            ...results,
+            ...results.filter((result) => result.id !== payload.id),
             { id: payload.id, data: result.data },
           ])
         }
@@ -494,6 +481,10 @@ export const useGraphQLReducer = (
           type: 'set-quick-editing-supported',
           value: event.data.value,
         })
+        iframe.current?.contentWindow?.postMessage({
+          type: 'quickEditEnabled',
+          value: cms.state.sidebarDisplayState === 'open',
+        })
       }
       if (event?.data?.type === 'isEditMode') {
         iframe?.current?.contentWindow?.postMessage({
@@ -503,6 +494,7 @@ export const useGraphQLReducer = (
       if (event.data.type === 'field:selected') {
         const [queryId, eventFieldName] = event.data.fieldName.split('---')
         const result = results.find((res) => res.id === queryId)
+        console.log(results)
         if (result?.data) {
           cms.dispatch({
             type: 'forms:set-active-field-name',
@@ -564,9 +556,9 @@ export const useGraphQLReducer = (
   React.useEffect(() => {
     iframe.current?.contentWindow?.postMessage({
       type: 'quickEditEnabled',
-      value: cms.state.quickEditEnabled,
+      value: cms.state.sidebarDisplayState === 'open',
     })
-  }, [cms.state.quickEditEnabled])
+  }, [cms.state.sidebarDisplayState])
 
   React.useEffect(() => {
     cms.dispatch({ type: 'set-edit-mode', value: 'visual' })

package/src/lib/util.ts

@@ -113,7 +113,12 @@ export const getFormAndFieldNameFromMetadata = (
         ? fieldName.slice(value?.name?.length + 1)
         : fieldName
       if (localFieldName) {
-        n = value.fields[localFieldName]
+        // If localFieldName is tags.2, just use `tags`
+        if (!isNaN(Number(localFieldName.split('.')[1]))) {
+          n = value.fields[localFieldName.split('.')[0]]
+        } else {
+          n = value.fields[localFieldName]
+        }
       } else {
         n = value.name
       }