pass in focused step / rule when updating data from extension

Composer/packages/client/src/ShellApi.ts

@@ -167,10 +167,10 @@ export function ShellApi() {
   }
 
   // persist value change
-  function handleValueChange(newData, event) {
+  function handleValueChange({ newData, updatePath }, event) {
     let dataPath = '';
     if (event.source.name === FORM_EDITOR) {
-      dataPath = getFocusPath(focusedEvent, focusedSteps[0]);
+      dataPath = updatePath || getFocusPath(focusedEvent, focusedSteps[0]);
     }
 
     const updatedDialog = setDialogData(dialogsMap, dialogId, dataPath, newData);

Composer/packages/client/src/extension-container/ExtensionContainer.tsx

@@ -31,8 +31,8 @@ const shellApi = {
     return apiClient.apiCall('getState', {});
   },
 
-  saveData: newData => {
-    return apiClient.apiCall('saveData', newData);
+  saveData: (newData, updatePath) => {
+    return apiClient.apiCall('saveData', { newData, updatePath });
   },
 
   navTo: (path, rest) => {
@@ -103,7 +103,6 @@ function ExtensionContainer() {
     apiClient.connect();
 
     apiClient.registerApi('reset', newShellData => {
-      console.log('FORM: apiReset');
       setShellData(newShellData);
     });
 
@@ -125,8 +124,6 @@ function ExtensionContainer() {
 
   const RealEditor = shellData.data ? getEditor() : null;
 
-  console.log('FORM: extension container');
-
   return RealEditor && <RealEditor {...shellData} onChange={shellApi.saveData} shellApi={shellApi} />;
 }
 

Composer/packages/extensions/obiformeditor/src/FormEditor.tsx

@@ -25,12 +25,13 @@ export interface FormEditorProps {
   dialogs: DialogInfo[];
   focusPath: string;
   focusedEvent: string;
+  focusedSteps: string[];
   isRoot: boolean;
   lgFiles: LgFile[];
   luFiles: LuFile[];
   memory: FormMemory;
   onBlur?: () => void;
-  onChange: (newData: object) => void;
+  onChange: (newData: object, updatePath?: string) => void;
   schemas: EditorSchema;
   shellApi: ShellApi;
 }

Composer/packages/extensions/obiformeditor/src/ObiFormEditor.tsx

@@ -26,9 +26,13 @@ const ErrorInfo: React.FC<FallbackProps> = ({ componentStack, error }) => (
 );
 
 const ObiFormEditor: React.FC<FormEditorProps> = props => {
+  const onChange = data => {
+    props.onChange(data, props.focusedSteps[0] || props.focusedEvent);
+  };
+
   return (
     <ErrorBoundary key={props.focusPath} FallbackComponent={ErrorInfo}>
-      <FormEditor {...props} />
+      <FormEditor {...props} onChange={onChange} />
     </ErrorBoundary>
   );
 };

Composer/packages/extensions/obiformeditor/src/types.ts

@@ -61,7 +61,7 @@ export interface FormData {
 export interface ShellApi {
   getState: <T = any>() => Promise<T>;
   getDialogs: <T = any>() => Promise<T>;
-  saveData: <T = any>(newData: T) => Promise<void>;
+  saveData: <T = any>(newData: T, updatePath: string) => Promise<void>;
   navTo: (path: string) => Promise<void>;
   onFocusSteps: (stepIds: string[]) => Promise<void>;
   onFocusEvent: (eventId: string) => Promise<void>;

Composer/yarn.lock

@@ -2226,7 +2226,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16.8.13", "@types/react@^16.8.23":
+"@types/react@*", "@types/react@^16.8.0", "@types/react@^16.8.13", "@types/react@^16.8.23":
   version "16.9.1"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.1.tgz#862c83b4c9d5cd116e42fd9a4f3694843cd2c051"
   integrity sha512-jGM2x8F7m7/r+81N/BOaUKVwbC5Cdw6ExlWEUpr77XPwVeNvAppnPEnMMLMfxRDYL8FPEX8MHjwtD2NQMJ0yyQ==