fix: RepeatDialog not shown (#1835)

* render fallback node * fix the problem in a more schema-driven way * revert unnecessary changes
microsoft · Jan 8, 2020 · 8a8d205 · 8a8d205
1 parent 25b2fae
commit 8a8d205
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Composer/packages/extensions/visual-designer/src/schema/uischema.ts b/Composer/packages/extensions/visual-designer/src/schema/uischema.ts
@@ -8,6 +8,9 @@ import { ActionCard } from '../widgets/ActionCard';
 import { UISchema } from './uischema.types';
 
 export const uiSchema: UISchema = {
+  default: {
+    'ui:widget': ActionCard,
+  },
   [SDKTypes.EditArray]: {
     'ui:widget': ActionCard,
     content: data => `${data.changeType} {${data.itemsProperty || '?'}}`,

diff --git a/Composer/packages/extensions/visual-designer/src/schema/uischema.types.ts b/Composer/packages/extensions/visual-designer/src/schema/uischema.types.ts
@@ -4,9 +4,13 @@
 import { FC, ComponentClass } from 'react';
 import { BaseSchema, SDKTypes } from '@bfc/shared';
 
+export enum UISchemaBuiltinKeys {
+  default = 'default',
+}
+
 /** schema */
 export type UISchema = {
-  [key in SDKTypes]?: UIWidget;
+  [key in SDKTypes | UISchemaBuiltinKeys]?: UIWidget;
 };
 
 /** widget */

diff --git a/Composer/packages/extensions/visual-designer/src/schema/uischemaRenderer.tsx b/Composer/packages/extensions/visual-designer/src/schema/uischemaRenderer.tsx
@@ -40,12 +40,9 @@ const renderWidget = (inputData, schema: UIWidget, contextProps = {}): JSX.Eleme
   return <Widget data={inputData} {...contextProps} {...props} />;
 };
 
-const renderFallbackElement = (data: BaseSchema) => <></>;
-
 export const renderSDKType = (data: BaseSchema, context?: { menu: JSX.Element; onClick }): JSX.Element => {
   const $type = get(data, '$type');
-  const schema: UIWidget = get(uiSchema, $type);
-  if (!schema) return renderFallbackElement(data);
+  const schema = get(uiSchema, $type, uiSchema.default);
 
   return renderWidget(data, schema, context);
 };