Merge c2a7a782d1 into 70532d6273

src/common/CONSTANTS.js

@@ -12,7 +12,6 @@ const CATALOG_PREVIEW_SIZE = 10;
 const CATALOG_PAGE_SIZE = 100;
 const NONE_EXTRA_VALUE = 'None';
 const SKIP_EXTRA_NAME = 'skip';
-const META_LINK_CATEGORY = 'meta';
 const IMDB_LINK_CATEGORY = 'imdb';
 const SHARE_LINK_CATEGORY = 'share';
 const WRITERS_LINK_CATEGORY = 'Writers';
@@ -134,7 +133,6 @@ module.exports = {
     CATALOG_PAGE_SIZE,
     NONE_EXTRA_VALUE,
     SKIP_EXTRA_NAME,
-    META_LINK_CATEGORY,
     IMDB_LINK_CATEGORY,
     SHARE_LINK_CATEGORY,
     WRITERS_LINK_CATEGORY,

src/core/types/models/MetaDetails.d.ts

@@ -5,11 +5,6 @@ type MetaItemMetaDetails = MetaItem & {
 };
 
 type MetaDetails = {
-    metaExtensions: {
-        url: string,
-        name: string,
-        addon: Addon,
-    }[],
     metaItem: {
         addon: Addon,
         content: Loadable<MetaItemMetaDetails>,

src/routes/MetaDetails/MetaDetails.js

@@ -8,12 +8,11 @@ const { useCore } = require('stremio/core');
 const { useContentGamepadNavigation } = require('stremio/services/GamepadNavigation');
 const { withCoreSuspender } = require('stremio/common');
 const { useNavigateWithOrigin } = require('stremio-router');
-const { VerticalNavBar, HorizontalNavBar, DelayedRenderer, Image, MetaPreview, ModalDialog } = require('stremio/components');
+const { HorizontalNavBar, DelayedRenderer, Image, MetaPreview } = require('stremio/components');
 const StreamsList = require('./StreamsList');
 const VideosList = require('./VideosList');
 const useMetaDetails = require('./useMetaDetails');
 const useSeason = require('./useSeason');
-const useMetaExtensionTabs = require('./useMetaExtensionTabs');
 const styles = require('./styles');
 
 const GAMEPAD_HANDLER_ID = 'metadetails';
@@ -33,7 +32,6 @@ const MetaDetails = () => {
     }), [type, id, videoId]);
     const metaDetails = useMetaDetails(urlParams);
     const [season, setSeason] = useSeason(urlParams);
-    const [tabs, metaExtension, clearMetaExtension] = useMetaExtensionTabs(metaDetails.metaExtensions);
     const [metaPath, streamPath] = React.useMemo(() => {
         return metaDetails.selected !== null ?
             [metaDetails.selected.metaPath, metaDetails.selected.streamPath]
@@ -148,16 +146,6 @@ const MetaDetails = () => {
                 originPath={originPath}
             />
             <div ref={contentRef} className={styles['metadetails-content']}>
-                {
-                    tabs.length > 0 ?
-                        <VerticalNavBar
-                            className={styles['vertical-nav-bar']}
-                            tabs={tabs}
-                            selected={metaExtension !== null ? metaExtension.url : null}
-                        />
-                        :
-                        null
-                }
                 {
                     metaPath === null ?
                         <DelayedRenderer delay={500}>
@@ -232,21 +220,6 @@ const MetaDetails = () => {
                             null
                 }
             </div>
-            {
-                metaExtension !== null ?
-                    <ModalDialog
-                        className={styles['meta-extension-modal-container']}
-                        title={metaExtension.name}
-                        onCloseRequest={clearMetaExtension}>
-                        <iframe
-                            className={styles['meta-extension-modal-iframe']}
-                            sandbox={'allow-forms allow-scripts allow-same-origin'}
-                            src={metaExtension.url}
-                        />
-                    </ModalDialog>
-                    :
-                    null
-            }
         </div>
     );
 };

src/routes/MetaDetails/styles.less

@@ -3,11 +3,6 @@
 @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less';
 @import (reference) '~stremio/common/screen-sizes.less';
 
-:import('~stremio/components/ModalDialog/styles.less') {
-    modal-dialog-container: modal-dialog-container;
-    title-modal-container: title-container;
-}
-
 .metadetails-container {
     display: flex;
     flex-direction: column;
@@ -53,9 +48,6 @@
         margin-top: calc(var(--top-overlay-size) * -1);
         padding-top: var(--top-overlay-size);
         padding-bottom: var(--safe-area-inset-bottom, 0rem);
-        .vertical-nav-bar {
-            flex: none;
-        }
 
         .meta-message-container {
             align-self: stretch;
@@ -109,22 +101,6 @@
     }
 }
 
-.meta-extension-modal-container {
-    .modal-dialog-container {
-        width: 80%;
-        height: 80%;
-
-        .title-modal-container {
-            max-height: 1.2em;
-        }
-
-        .meta-extension-modal-iframe {
-            width: 100%;
-            height: 100%;
-        }
-    }
-}
-
 @media @phone-landscape {
     .metadetails-container {
         .metadetails-content {

src/routes/MetaDetails/useMetaExtensionTabs.js

@@ -1,23 +0,0 @@
-// Copyright (C) 2017-2023 Smart code 203358507
-
-const React = require('react');
-
-const useMetaExtensionTabs = (metaExtensions) => {
-    const tabs = React.useMemo(() => {
-        return metaExtensions
-            .map((extension) => ({
-                id: extension.url,
-                label: extension.addon.manifest.name,
-                logo: extension.addon.manifest.logo,
-                icon: 'addons',
-                onClick: () => setSelected(extension)
-            }));
-    }, [metaExtensions]);
-    const [selected, setSelected] = React.useState(null);
-    const clear = React.useCallback(() => {
-        setSelected(null);
-    }, []);
-    return [tabs, selected, clear];
-};
-
-module.exports = useMetaExtensionTabs;