Skip to content

Commit

Permalink
Merged pr
Browse files Browse the repository at this point in the history
  • Loading branch information
Elius94 committed Jan 9, 2023
1 parent 1463730 commit 76f10bd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-photo-sphere-viewer",
"version": "3.1.1-psv5.0.2",
"version": "3.1.2-psv5.0.2",
"description": "Photosphere Viewer for React.JS, wrapper of photo-sphere-viewer.js",
"author": "Elius94",
"license": "MIT",
Expand Down
14 changes: 7 additions & 7 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ function map(_in: number, inMin: number, inMax: number, outMin: number, outMax:
}

function filterNavbar(navbar?: boolean | string | Array<string | NavbarCustomButton>): false | Array<string | NavbarCustomButton> {
if (navbar == null) return defaultNavbar;
if (navbar == null) return defaultNavbar
if (!Array.isArray(navbar)) {
if (typeof navbar === 'string') {
return navbar === '' ? false : [navbar];
if (typeof navbar === "string") {
return navbar === "" ? false : [navbar]
}
return navbar ? defaultNavbar : false;
return navbar ? defaultNavbar : false
}
return navbar;
return navbar
}

const ReactPhotoSphereViewer = forwardRef((options: Props, ref: unknown): React.ReactElement => {
Expand Down Expand Up @@ -271,7 +271,7 @@ const ReactPhotoSphereViewer = forwardRef((options: Props, ref: unknown): React.
})
},
}
const _currentNavbar = filterNavbar(options.navbar);
const _currentNavbar = filterNavbar(options.navbar)
if (_currentNavbar !== false && !_currentNavbar.find((item) => typeof item === "object" && item?.id === "resetLittlePlanetButton")) {
_currentNavbar.push(resetLittlePlanetButton)
_c.setOption("navbar", _currentNavbar)
Expand Down Expand Up @@ -403,7 +403,7 @@ const ReactPhotoSphereViewer = forwardRef((options: Props, ref: unknown): React.
}), [spherePlayerInstance, sphereElementRef, options, ref])

return (
<div className={options.containerClass || "view-container"} ref={sphereElementRef} />
<div className={options.containerClass || "view-container"} ref={sphereElementRef} />
)
})

Expand Down

0 comments on commit 76f10bd

Please sign in to comment.