Merge pull request #19 from Doist/scottl/update-core-in-react

chore: Updates core package usage in react package
Doist · Jul 21, 2022 · b0a0a09 · b0a0a09
2 parents 1207574 + 87f61d5
commit b0a0a09
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ui-extensions-react/package.json b/packages/ui-extensions-react/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@doist/ui-extensions-react",
-    "version": "3.1.6",
+    "version": "3.2.0",
     "author": "Doist",
     "license": "MIT",
     "main": "dist/index.js",
@@ -36,7 +36,7 @@
     },
     "peerDependencies": {
         "@doist/reactist": "^12.0.0",
-        "@doist/ui-extensions-core": "^3.1.4",
+        "@doist/ui-extensions-core": "^3.2.1",
         "adaptivecards": "^2.9.0",
         "react": ">=17"
     },

diff --git a/packages/ui-extensions-react/src/hooks/useAdaptiveCardsConnection.test.ts b/packages/ui-extensions-react/src/hooks/useAdaptiveCardsConnection.test.ts
@@ -140,11 +140,12 @@ describe('useAdaptiveCardsConnection tests', () => {
             const expected = 'hello'
             getProcessRequestMock().mockImplementationOnce(() => {
                 return Promise.resolve({
-                    card: {},
-                    bridge: {
-                        bridgeActionType: 'composer.append',
-                        text: expected,
-                    },
+                    bridges: [
+                        {
+                            bridgeActionType: 'composer.append',
+                            text: expected,
+                        },
+                    ],
                 } as DoistCardResponse)
             })
 

diff --git a/packages/ui-extensions-react/src/hooks/useAdaptiveCardsConnection.ts b/packages/ui-extensions-react/src/hooks/useAdaptiveCardsConnection.ts
@@ -75,23 +75,20 @@ export function useAdaptiveCardsConnection({
                     token,
                 )
 
-                const { card, bridge, bridges } = response
+                const { card, bridges } = response
 
                 if (bridges) {
                     bridges.forEach((bridge: DoistCardBridge) => {
                         const callback = bridgeActionCallbacks[bridge.bridgeActionType]
                         callback?.(bridge)
                     })
-                } else if (bridge) {
-                    const callback = bridgeActionCallbacks[bridge.bridgeActionType]
-                    callback?.(bridge)
                 }
 
                 if (card) {
                     setCardData(card)
                 }
 
-                if (!card && !bridge) {
+                if (!card && !bridges) {
                     setError(
                         createError(version, new Error('No card or bridge data returned'), request),
                     )