Merge branch 'master' into visual/dynamic-layout

microsoft · Feb 21, 2020 · a0c7c94 · a0c7c94
2 parents fefd425 + b58fa5b
commit a0c7c94
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/Composer/packages/extensions/visual-designer/src/components/lib/KeyboardZone.tsx b/Composer/packages/extensions/visual-designer/src/components/lib/KeyboardZone.tsx
@@ -17,7 +17,6 @@ const KeyNameByModifierAttr = {
 const overriddenKeyCodes = ['Tab', 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'];
 
 interface KeyboardZoneProps {
-  when: string;
   onCommand: (action, e: KeyboardEvent) => object | void;
 }
 
@@ -35,7 +34,7 @@ const buildModifierKeyPrefix = (e: KeyboardEvent): string => {
   return prefix;
 };
 
-export const KeyboardZone: FC<KeyboardZoneProps> = ({ when, onCommand, children }): JSX.Element => {
+export const KeyboardZone: FC<KeyboardZoneProps> = ({ onCommand, children }): JSX.Element => {
   const handleKeyDown = e => {
     if (overriddenKeyCodes.includes(e.key)) {
       e.preventDefault();

diff --git a/Composer/packages/extensions/visual-designer/src/editors/ObiEditor.tsx b/Composer/packages/extensions/visual-designer/src/editors/ObiEditor.tsx
@@ -182,22 +182,12 @@ export const ObiEditor: FC<ObiEditorProps> = ({
     selectedIds: [],
   });
 
-  const [keyboardStatus, setKeyBoardStatus] = useState('normal');
-
   useEffect((): void => {
     // Notify container at every selection change.
     onSelect(selectionContext.selectedIds.length ? selectionContext.selectedIds : focusedId ? [focusedId] : []);
   }, [focusedId, selectionContext]);
 
   useEffect((): void => {
-    if (selectionContext.selectedIds.length > 0) {
-      setKeyBoardStatus('selected');
-    } else if (focusedId) {
-      setKeyBoardStatus('focused');
-    } else {
-      setKeyBoardStatus('normal');
-    }
-
     selection.setItems(nodeIndexGenerator.current.getItemList());
   });
 
@@ -296,7 +286,7 @@ export const ObiEditor: FC<ObiEditorProps> = ({
   if (!data) return renderFallbackContent();
   return (
     <SelectionContext.Provider value={selectionContext}>
-      <KeyboardZone onCommand={handleKeyboardCommand} when={keyboardStatus}>
+      <KeyboardZone onCommand={handleKeyboardCommand}>
         <MarqueeSelection selection={selection} css={{ width: '100%', height: '100%' }}>
           <div
             tabIndex={0}