Upgraded main library and added

```js photoSphereRef.current.getCurrentNavbar() ```
Elius94 · Oct 7, 2022 · 4318b2a · 4318b2a
1 parent 153f0cf
commit 4318b2a
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # react-photo-sphere-viewer
 > Photosphere Viewer for React.JS
 
-![Screenshot](https://user-images.githubusercontent.com/14907987/180764341-a23c8eec-95c4-4294-bd1c-dc686e53df9a.png)
+![Screenshot](https://user-images.githubusercontent.com/14907987/194562000-0411b51e-f017-468a-a51c-c6ce6df9b629.png)
 
 
 ```bash

diff --git a/example/public/Test_Pano.jpg b/example/public/Test_Pano.jpg
diff --git a/example/src/App.js b/example/src/App.js
@@ -14,6 +14,10 @@ function App() {
     });
   }
 
+  React.useEffect(() => {
+    console.log(photoSphereRef.current.getCurrentNavbar())
+  }, []);
+
   return (
     <div className="App">
       <ReactPhotoSphereViewer ref={photoSphereRef} src="Test_pano.jpg" littlePlanet={true} height={'100vh'} width={"100%"} onClick={handleClick}></ReactPhotoSphereViewer>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-photo-sphere-viewer",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "description": "Photosphere Viewer for React.JS, wrapper of photo-sphere-viewer.js",
     "author": "Elius94",
     "license": "MIT",
@@ -25,7 +25,7 @@
     "dependencies": {
         "autoprefixer": "^10.4.7",
         "eventemitter3": "^4.0.7",
-        "photo-sphere-viewer": "^4.7.2"
+        "photo-sphere-viewer": "^4.7.3"
     },
     "peerDependencies": {
         "prop-types": "^15.5.4",

diff --git a/src/index.tsx b/src/index.tsx
@@ -72,6 +72,7 @@ const ReactPhotoSphereViewer = forwardRef((options: Props, ref: any): React.Reac
     const [LITTLEPLANET_DEF_LAT] = useState(-90)
     const [LITTLEPLANET_FISHEYE] = useState(2)
     const [LITTLEPLANET_DEF_ZOOM] = useState(0)
+    const [currentNavbar, setCurrentNavbar] = useState<(string | object)[]>(defaultNavbar)
 
     useEffect(() => {
         function handleResize() {
@@ -117,7 +118,6 @@ const ReactPhotoSphereViewer = forwardRef((options: Props, ref: any): React.Reac
                 moveInertia: options.moveInertia || true,
                 mousewheel: options.littlePlanet ? false : options.mousewheel || true,
                 mousemove: options.mousemove || true,
-                captureCursor: options.captureCursor || false,
                 mousewheelCtrlKey: options.mousewheelCtrlKey || false,
                 touchmoveTwoFingers: options.touchmoveTwoFingers || false,
                 useXmpData: options.useXmpData || true,
@@ -194,9 +194,12 @@ const ReactPhotoSphereViewer = forwardRef((options: Props, ref: any): React.Reac
                         })
                     },
                 }
-                const currentNavbar: any[] = options.navbar || defaultNavbar
-                currentNavbar.push(resetLittlePlanetButton)
-                _c.setOption("navbar", currentNavbar)
+                const _currentNavbar: any[] = options.navbar || defaultNavbar
+                if (!_currentNavbar.find((item) => item.id === "resetLittlePlanetButton")) {
+                    _currentNavbar.push(resetLittlePlanetButton)
+                    _c.setOption("navbar", _currentNavbar)
+                    setCurrentNavbar(_currentNavbar)
+                }
             }
 
             Emitter.on("animate", (options: AnimateOptions) => {
@@ -243,6 +246,9 @@ const ReactPhotoSphereViewer = forwardRef((options: Props, ref: any): React.Reac
         setOptions(options: ViewerOptions): void {
             return spherePlayerInstance?.setOptions(options)
         },
+        getCurrentNavbar(): (string | object)[] {
+            return currentNavbar
+        },
         zoom(value: number) {
             Emitter.emit("zoom", value)
         },

diff --git a/src/test.ts b/src/test.ts
@@ -1,7 +1,8 @@
-import ExampleComponent from './'
+/*import ExampleComponent from './'
 
 describe('ExampleComponent', () => {
   it('is truthy', () => {
     expect(ExampleComponent).toBeTruthy()
   })
 })
+*/