- {
- level > 0 ?
-
- : null
+
+ {level > 0 ?
+
+ : null
}
- {
- options
- .filter((option: MultiselectMenuOption) => !option.hidden)
- .map((option: MultiselectMenuOption, index) => (
-
- ))
-
+ {options
+ .filter((option: MultiselectMenuOption) => !option.hidden)
+ .map((option: MultiselectMenuOption) => (
+
+ ))
}
);
diff --git a/src/common/MultiselectMenu/Dropdown/Option/Option.tsx b/src/common/MultiselectMenu/Dropdown/Option/Option.tsx
index 13ea37bd5..3812282a2 100644
--- a/src/common/MultiselectMenu/Dropdown/Option/Option.tsx
+++ b/src/common/MultiselectMenu/Dropdown/Option/Option.tsx
@@ -1,6 +1,6 @@
// Copyright (C) 2017-2024 Smart code 203358507
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo, forwardRef } from 'react';
import classNames from 'classnames';
import Button from 'stremio/common/Button';
import styles from './Option.less';
@@ -12,7 +12,7 @@ type Props = {
onSelect: (value: number) => void;
};
-const Option = ({ option, selectedOption, onSelect }: Props) => {
+const Option = forwardRef
(({ option, selectedOption, onSelect }, ref) => {
// consider using option.id === selectedOption?.id instead
const selected = useMemo(() => option?.value === selectedOption?.value, [option, selectedOption]);
@@ -22,6 +22,7 @@ const Option = ({ option, selectedOption, onSelect }: Props) => {
return (
);
-};
+});
+
+Option.displayName = 'Option';
export default Option;
From c65b10e9158f83541d1988bc7bcf8849d7f7ed5a Mon Sep 17 00:00:00 2001
From: "Timothy Z."
Date: Fri, 3 Jan 2025 15:27:34 +0200
Subject: [PATCH 38/44] fix(Board): Hide empty catalogs
---
src/routes/Board/Board.js | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js
index a494a02ee..facdded5c 100644
--- a/src/routes/Board/Board.js
+++ b/src/routes/Board/Board.js
@@ -57,14 +57,21 @@ const Board = () => {
{board.catalogs.map((catalog, index) => {
switch (catalog.content?.type) {
case 'Ready': {
- return (
-
- );
+ if (catalog.content.content.length > 0) {
+ return (
+
+ );
+ }
+ return null;
}
case 'Err': {
return (
From 2288bd27d0466580ddd97df41581412b44b714d9 Mon Sep 17 00:00:00 2001
From: "Timothy Z."
Date: Fri, 3 Jan 2025 15:41:44 +0200
Subject: [PATCH 39/44] refactor(Board): dont show err instead
---
src/routes/Board/Board.js | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js
index facdded5c..e2a646789 100644
--- a/src/routes/Board/Board.js
+++ b/src/routes/Board/Board.js
@@ -57,29 +57,12 @@ const Board = () => {
{board.catalogs.map((catalog, index) => {
switch (catalog.content?.type) {
case 'Ready': {
- if (catalog.content.content.length > 0) {
- return (
-
- );
- }
- return null;
- }
- case 'Err': {
return (
);
}
From 5ebc8df63fdbb0b94d394bf67048e2f8421cdaf2 Mon Sep 17 00:00:00 2001
From: "Timothy Z."
Date: Fri, 3 Jan 2025 17:14:04 +0200
Subject: [PATCH 40/44] refactor(Board): hide only empty catalogs
---
src/routes/Board/Board.js | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js
index e2a646789..238dd106d 100644
--- a/src/routes/Board/Board.js
+++ b/src/routes/Board/Board.js
@@ -66,6 +66,19 @@ const Board = () => {
/>
);
}
+ case 'Err': {
+ if (!catalog.content.content === 'EmptyContent') {
+ return (
+
+ );
+ }
+ return null;
+ }
default: {
return (
Date: Fri, 3 Jan 2025 17:17:49 +0200
Subject: [PATCH 41/44] refactor(Board): use !== instead
---
src/routes/Board/Board.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js
index 238dd106d..528d4ce0e 100644
--- a/src/routes/Board/Board.js
+++ b/src/routes/Board/Board.js
@@ -67,7 +67,7 @@ const Board = () => {
);
}
case 'Err': {
- if (!catalog.content.content === 'EmptyContent') {
+ if (catalog.content.content !== 'EmptyContent') {
return (
Date: Fri, 3 Jan 2025 18:06:17 +0200
Subject: [PATCH 42/44] remove(StreamingServerWarning): changes
---
src/common/StreamingServerWarning/styles.less | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/common/StreamingServerWarning/styles.less b/src/common/StreamingServerWarning/styles.less
index 873a27a1a..d4fad4b9f 100644
--- a/src/common/StreamingServerWarning/styles.less
+++ b/src/common/StreamingServerWarning/styles.less
@@ -9,9 +9,6 @@
align-items: center;
background-color: @color-accent5-dark3;
padding: 1rem;
- border-radius: 0.5rem 0.5rem 0 0;
- margin: 0rem 0.5rem;
- box-shadow: var(--outer-glow);
.warning-statement {
flex: 1;
@@ -24,11 +21,7 @@
.warning-button {
flex: none;
color: @color-surface-light5-90;
- background-color: rgba(0, 0, 0, 0.24);
- padding: 0.5rem 1rem;
- margin-left: 1.5rem;
- border-radius: 0.5rem;
- line-height: 1.2rem;
+ margin-left: 1rem;
&:first-child {
margin-left: 0;
@@ -44,7 +37,6 @@
font-size: 1.2rem;
max-height: 1.2em;
color: @color-surface-light5-90;
- overflow: visible;
}
}
@@ -53,18 +45,15 @@
}
}
-@media only screen and (max-width: @minimum) {
+@media only screen and (max-width: 500px) {
.warning-container {
display: block;
height: auto !important;
text-align: center;
- border-radius: 0.5rem;
-
.warning-statement {
- margin-bottom: 1rem;
+ margin-bottom: 0.5rem;
margin-right: 0;
}
-
.warning-button {
display: inline-block;
}
From 5c531fb3e3debde94870f505f58cc9da6230128d Mon Sep 17 00:00:00 2001
From: "Timothy Z."
Date: Fri, 3 Jan 2025 18:07:20 +0200
Subject: [PATCH 43/44] remove: Style changes on streamingserverwarning(2)
---
src/common/StreamingServerWarning/styles.less | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/common/StreamingServerWarning/styles.less b/src/common/StreamingServerWarning/styles.less
index d4fad4b9f..42ab6bb4b 100644
--- a/src/common/StreamingServerWarning/styles.less
+++ b/src/common/StreamingServerWarning/styles.less
@@ -1,14 +1,13 @@
-// Copyright (C) 2017-2024 Smart code 203358507
+// Copyright (C) 2017-2023 Smart code 203358507
@import (reference) '~@stremio/stremio-colors/less/stremio-colors.less';
-@import (reference) '~stremio/common/screen-sizes.less';
.warning-container {
display: flex;
flex-direction: row;
align-items: center;
- background-color: @color-accent5-dark3;
padding: 1rem;
+ background-color: @color-accent5-dark3;
.warning-statement {
flex: 1;
@@ -20,8 +19,8 @@
.warning-button {
flex: none;
- color: @color-surface-light5-90;
margin-left: 1rem;
+ color: @color-surface-light5-90;
&:first-child {
margin-left: 0;
From 326fc1263bf4c1f7cc5554bc593a59e425f9a938 Mon Sep 17 00:00:00 2001
From: Tim
Date: Mon, 6 Jan 2025 10:55:24 +0100
Subject: [PATCH 44/44] 5.0.0-beta.16
---
package-lock.json | 4 ++--
package.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index c0876ac29..be53e9ec7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "stremio",
- "version": "5.0.0-beta.15",
+ "version": "5.0.0-beta.16",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "stremio",
- "version": "5.0.0-beta.15",
+ "version": "5.0.0-beta.16",
"license": "gpl-2.0",
"dependencies": {
"@babel/runtime": "7.26.0",
diff --git a/package.json b/package.json
index 0b784890c..79593f9d5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "stremio",
"displayName": "Stremio",
- "version": "5.0.0-beta.15",
+ "version": "5.0.0-beta.16",
"author": "Smart Code OOD",
"private": true,
"license": "gpl-2.0",