Remove duplicate toolbar from scene composer (#72)

* Remove duplicate toolbar from scene composer
awslabs · Aug 28, 2022 · 7c94342 · 7c94342
1 parent 57f013d
commit 7c94342
Show file tree

Hide file tree

Showing 3 changed files with 693 additions and 2,171 deletions.
diff --git a/packages/scene-composer/src/components/__snapshots__/SceneComposerInternal.spec.tsx.snap b/packages/scene-composer/src/components/__snapshots__/SceneComposerInternal.spec.tsx.snap
@@ -12,9 +12,6 @@ exports[`SceneComposerInternal should render a default error view when loading a
   }
   mainContent={
     <React.Fragment>
-      <FloatingToolbar
-        isViewing={false}
-      />
       <LogProvider
         ErrorView={[Function]}
         namespace="SceneLayout"
@@ -90,9 +87,6 @@ exports[`SceneComposerInternal should render both valid and invalid scene correc
     }
     mainContent={
       <React.Fragment>
-        <FloatingToolbar
-          isViewing={false}
-        />
         <LogProvider
           ErrorView={[Function]}
           namespace="SceneLayout"
@@ -141,9 +135,6 @@ exports[`SceneComposerInternal should render both valid and invalid scene correc
     }
     mainContent={
       <React.Fragment>
-        <FloatingToolbar
-          isViewing={false}
-        />
         <LogProvider
           ErrorView={[Function]}
           namespace="SceneLayout"
@@ -196,9 +187,6 @@ exports[`SceneComposerInternal should render correctly with a valid scene in edi
   }
   mainContent={
     <React.Fragment>
-      <FloatingToolbar
-        isViewing={false}
-      />
       <LogProvider
         ErrorView={[Function]}
         namespace="SceneLayout"
@@ -250,9 +238,6 @@ exports[`SceneComposerInternal should render correctly with an empty scene in ed
   }
   mainContent={
     <React.Fragment>
-      <FloatingToolbar
-        isViewing={false}
-      />
       <LogProvider
         ErrorView={[Function]}
         namespace="SceneLayout"
@@ -300,9 +285,6 @@ exports[`SceneComposerInternal should render correctly with an empty scene in vi
   }
   mainContent={
     <React.Fragment>
-      <FloatingToolbar
-        isViewing={true}
-      />
       <LogProvider
         ErrorView={[Function]}
         namespace="SceneLayout"
@@ -348,9 +330,6 @@ exports[`SceneComposerInternal should render error when major version is newer 1
   }
   mainContent={
     <React.Fragment>
-      <FloatingToolbar
-        isViewing={false}
-      />
       <LogProvider
         ErrorView={[Function]}
         namespace="SceneLayout"
@@ -402,9 +381,6 @@ exports[`SceneComposerInternal should render error when specVersion is invalid 1
   }
   mainContent={
     <React.Fragment>
-      <FloatingToolbar
-        isViewing={false}
-      />
       <LogProvider
         ErrorView={[Function]}
         namespace="SceneLayout"
@@ -456,9 +432,6 @@ exports[`SceneComposerInternal should render warning when minor version is newer
   }
   mainContent={
     <React.Fragment>
-      <FloatingToolbar
-        isViewing={false}
-      />
       <LogProvider
         ErrorView={[Function]}
         namespace="SceneLayout"
@@ -511,9 +484,6 @@ exports[`SceneComposerInternal should support rendering multiple valid scenes 1`
     }
     mainContent={
       <React.Fragment>
-        <FloatingToolbar
-          isViewing={false}
-        />
         <LogProvider
           ErrorView={[Function]}
           namespace="SceneLayout"
@@ -562,9 +532,6 @@ exports[`SceneComposerInternal should support rendering multiple valid scenes 1`
     }
     mainContent={
       <React.Fragment>
-        <FloatingToolbar
-          isViewing={false}
-        />
         <LogProvider
           ErrorView={[Function]}
           namespace="SceneLayout"

diff --git a/packages/scene-composer/src/layouts/SceneLayout/SceneLayout.tsx b/packages/scene-composer/src/layouts/SceneLayout/SceneLayout.tsx
@@ -81,7 +81,6 @@ const SceneLayout: FC<SceneLayoutProps> = ({ isViewing, onPointerMissed, Loading
     <StaticLayout
       mainContent={
         <Fragment>
-          <FloatingToolbar isViewing={isViewing} />
           <LogProvider
             namespace={'SceneLayout'}
             ErrorView={DefaultErrorFallback}