fix(static-scene): mode prop is passed correctly & zoom feature is se…

…t only for presentation
jotform · Mar 3, 2023 · 6c045f5 · 6c045f5
1 parent 3caf4ab
commit 6c045f5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/src/components/Presentation/Presentation.js b/src/components/Presentation/Presentation.js
@@ -49,6 +49,7 @@ const Presentation = ({
                   hashCode={hashCode}
                   hideZoom={true}
                   itemAccessor={itemAccessor}
+                  mode="presentation"
                   pages={pages}
                   presentationPage={presentationPage}
                 />

diff --git a/src/components/Preview/Preview.js b/src/components/Preview/Preview.js
@@ -56,6 +56,7 @@ const Preview = ({
             isExistsZoom
             itemAccessor={itemAccessor}
             lastScrollPosition={lastScrollPosition}
+            mode="preview"
             pages={pages}
           />
         </ReportWrapper>

diff --git a/src/components/Preview/StaticScene.js b/src/components/Preview/StaticScene.js
@@ -131,7 +131,7 @@ StaticScene.propTypes = {
   hideZoom: PropTypes.bool,
   itemAccessor: PropTypes.func,
   lastScrollPosition: PropTypes.number,
-  mode: PropTypes.string,
+  mode: PropTypes.string.isRequired,
   pages: PropTypes.arrayOf(PropTypes.shape({})),
   presentationPage: PropTypes.number,
 };
@@ -143,7 +143,6 @@ StaticScene.defaultProps = {
   hideZoom: false,
   itemAccessor: () => {},
   lastScrollPosition: 0,
-  mode: 'preview',
   pages: [],
   presentationPage: 0,
 };

diff --git a/src/components/Print/PrintModeWithoutContext.js b/src/components/Print/PrintModeWithoutContext.js
@@ -10,7 +10,6 @@ const PrintModeWithoutContext = ({
   additionalPageItems,
   hashCode,
   itemAccessor,
-  mode,
   pages,
   settings,
   theme,
@@ -42,7 +41,7 @@ const PrintModeWithoutContext = ({
           hashCode={hashCode}
           hideZoom={true}
           itemAccessor={itemAccessor}
-          mode={mode}
+          mode="print"
           pages={pages}
         />
       </ReportWrapper>
@@ -54,7 +53,6 @@ PrintModeWithoutContext.propTypes = {
   additionalPageItems: PropTypes.arrayOf(PropTypes.node),
   hashCode: PropTypes.string,
   itemAccessor: PropTypes.func,
-  mode: PropTypes.string,
   pages: PropTypes.arrayOf(
     PropTypes.shape({}),
   ),
@@ -70,7 +68,6 @@ PrintModeWithoutContext.defaultProps = {
   additionalPageItems: [],
   hashCode: '',
   itemAccessor: () => {},
-  mode: 'print',
   pages: [],
   settings: {},
   theme: 'lightMode',

diff --git a/src/components/withZoomPanPinchHOC.js b/src/components/withZoomPanPinchHOC.js
@@ -12,7 +12,7 @@ const withZoomPanPinchHOC = WrappedComponent => {
     const { zoom } = useBuilderContext();
     const { fittedZoom } = usePresentationContext();
 
-    if (mode === 'print') {
+    if (mode !== 'presentation') {
       return <WrappedComponent {...props} />;
     }