From 722f3ffa729695cf981f29426171bc57a9f60ccf Mon Sep 17 00:00:00 2001 From: zeye Date: Tue, 19 Nov 2019 16:35:10 +0800 Subject: [PATCH 1/4] update samples to fix demo data --- .../visual-designer/demo/src/samples/todo/AddToDo.json | 2 +- .../visual-designer/demo/src/samples/todo/ClearToDos.json | 2 +- .../visual-designer/demo/src/samples/todo/DeleteToDo.json | 2 +- .../visual-designer/demo/src/samples/todo/ShowToDos.json | 2 +- .../visual-designer/demo/src/samples/todo/ToDoBot.main.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/AddToDo.json b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/AddToDo.json index 845351494f..f6f7be93f3 100644 --- a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/AddToDo.json +++ b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/AddToDo.json @@ -7,7 +7,7 @@ }, "autoEndDialog": true, "$schema": "../../app.schema", - "events": [ + "triggers": [ { "$type": "Microsoft.OnBeginDialog", "$designer": { diff --git a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ClearToDos.json b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ClearToDos.json index 69a893e2b6..d176fe4cc8 100644 --- a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ClearToDos.json +++ b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ClearToDos.json @@ -7,7 +7,7 @@ }, "autoEndDialog": true, "$schema": "../../app.schema", - "events": [ + "triggers": [ { "$type": "Microsoft.OnBeginDialog", "$designer": { diff --git a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/DeleteToDo.json b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/DeleteToDo.json index df2da5f86b..1d85694a58 100644 --- a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/DeleteToDo.json +++ b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/DeleteToDo.json @@ -7,7 +7,7 @@ }, "autoEndDialog": true, "$schema": "../../app.schema", - "events": [ + "triggers": [ { "$type": "Microsoft.OnBeginDialog", "$designer": { diff --git a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ShowToDos.json b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ShowToDos.json index 3976214862..4d02220aff 100644 --- a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ShowToDos.json +++ b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ShowToDos.json @@ -7,7 +7,7 @@ }, "autoEndDialog": true, "$schema": "../../app.schema", - "events": [ + "triggers": [ { "$type": "Microsoft.OnBeginDialog", "$designer": { diff --git a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ToDoBot.main.json b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ToDoBot.main.json index c910a32ce0..25e43edee5 100644 --- a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ToDoBot.main.json +++ b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/ToDoBot.main.json @@ -49,7 +49,7 @@ ] }, "generator": "common.lg", - "events": [ + "triggers": [ { "$type": "Microsoft.OnConversationUpdateActivity", "$designer": { From e8200e4853c360bc71bbeb2a5747ef8b9af551f3 Mon Sep 17 00:00:00 2001 From: zeye Date: Tue, 19 Nov 2019 17:05:15 +0800 Subject: [PATCH 2/4] fix demo --- .../visual-designer/demo/src/stories/VisualEditorDemo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/extensions/visual-designer/demo/src/stories/VisualEditorDemo.js b/Composer/packages/extensions/visual-designer/demo/src/stories/VisualEditorDemo.js index 17c7c5c6ec..ac85f83823 100644 --- a/Composer/packages/extensions/visual-designer/demo/src/stories/VisualEditorDemo.js +++ b/Composer/packages/extensions/visual-designer/demo/src/stories/VisualEditorDemo.js @@ -121,7 +121,7 @@ export class VisualEditorDemo extends Component { getLgTemplates: () => { return Promise.resolve([{ Name: 'lg', Body: 'LgTemplate Placeholder.' }]); }, - removeLgTemplate: () => { + removeLgTemplates: () => { return Promise.resolve(true); }, }} From 315e9eaa09af64d991c10ef8d894fc611a8e742a Mon Sep 17 00:00:00 2001 From: zeye Date: Tue, 19 Nov 2019 17:05:36 +0800 Subject: [PATCH 3/4] remove the misusing of useEffect hook --- .../extensions/visual-designer/src/index.tsx | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/Composer/packages/extensions/visual-designer/src/index.tsx b/Composer/packages/extensions/visual-designer/src/index.tsx index 0d46bc58a7..92b6871046 100644 --- a/Composer/packages/extensions/visual-designer/src/index.tsx +++ b/Composer/packages/extensions/visual-designer/src/index.tsx @@ -4,7 +4,7 @@ /** @jsx jsx */ import { jsx, CacheProvider } from '@emotion/core'; import createCache from '@emotion/cache'; -import React, { useRef, useState, useEffect } from 'react'; +import React, { useRef } from 'react'; import isEqual from 'lodash/isEqual'; import formatMessage from 'format-message'; @@ -63,7 +63,7 @@ const VisualDesigner: React.FC = ({ const focusedId = Array.isArray(focusedActions) && focusedActions[0] ? focusedActions[0] : ''; // NOTE: avoid re-render. https://reactjs.org/docs/context.html#caveats - const [context, setContext] = useState({ + const nodeContext = { focusedId, focusedEvent, focusedTab, @@ -73,21 +73,11 @@ const VisualDesigner: React.FC = ({ copyLgTemplate, removeLgTemplate, removeLgTemplates, - }); - - useEffect(() => { - setContext({ - ...context, - focusedId, - focusedEvent, - focusedTab, - clipboardActions, - }); - }, [focusedEvent, focusedActions, focusedTab, clipboardActions]); + }; return ( - +
Date: Tue, 19 Nov 2019 21:08:00 +0800 Subject: [PATCH 4/4] remove outdated comments --- Composer/packages/extensions/visual-designer/src/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/Composer/packages/extensions/visual-designer/src/index.tsx b/Composer/packages/extensions/visual-designer/src/index.tsx index 92b6871046..4b1a47ba44 100644 --- a/Composer/packages/extensions/visual-designer/src/index.tsx +++ b/Composer/packages/extensions/visual-designer/src/index.tsx @@ -62,7 +62,6 @@ const VisualDesigner: React.FC = ({ const focusedId = Array.isArray(focusedActions) && focusedActions[0] ? focusedActions[0] : ''; - // NOTE: avoid re-render. https://reactjs.org/docs/context.html#caveats const nodeContext = { focusedId, focusedEvent,