From 6749dd79fab23774c14e06d289a3813703799323 Mon Sep 17 00:00:00 2001 From: Gauravjeet Singh Date: Tue, 11 Jun 2024 18:09:02 -0400 Subject: [PATCH] fix: disable bani controller in multipane workspace --- .../bani-controller/components/BaniController.jsx | 7 +++++++ .../navigator/search/hooks/use-new-shabad.jsx | 6 +++++- www/main/navigator/shabad/ShabadText.jsx | 11 +---------- www/src/scss/styles.scss | 15 +++++++++++++-- www/src/scss/themes/helpers/_variables.scss | 1 + 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/www/main/addons/bani-controller/components/BaniController.jsx b/www/main/addons/bani-controller/components/BaniController.jsx index 11a70973..03818b9e 100644 --- a/www/main/addons/bani-controller/components/BaniController.jsx +++ b/www/main/addons/bani-controller/components/BaniController.jsx @@ -77,6 +77,7 @@ const BaniController = ({ onScreenClose, className }) => { content2FontSize, content3FontSize, baniLength, + currentWorkspace, // mangalPosition, } = useStoreState((state) => state.userSettings); @@ -230,6 +231,12 @@ const BaniController = ({ onScreenClose, className }) => {
) : ( <> + {currentWorkspace === i18n.t('WORKSPACES.MULTI_PANE') && ( +

+ + Bani controller is not supported in Multi-Pane workspace. +

+ )}
{codeLabel || i18n.t('TOOLBAR.SYNC_CONTROLLER.UNIQUE_CODE_LABEL')}
diff --git a/www/main/navigator/search/hooks/use-new-shabad.jsx b/www/main/navigator/search/hooks/use-new-shabad.jsx index dae6d062..6492f0d2 100644 --- a/www/main/navigator/search/hooks/use-new-shabad.jsx +++ b/www/main/navigator/search/hooks/use-new-shabad.jsx @@ -111,7 +111,11 @@ export const useNewShabad = () => { if (newSelectedVerse && activeVerseId !== newSelectedVerse) { setActiveVerseId(newSelectedVerse); } - if (window.socket !== undefined && window.socket !== null) { + if ( + window.socket !== undefined && + window.socket !== null && + currentWorkspace !== i18n.t('WORKSPACES.MULTI_PANE') + ) { window.socket.emit('data', { type: 'shabad', host: 'sttm-desktop', diff --git a/www/main/navigator/shabad/ShabadText.jsx b/www/main/navigator/shabad/ShabadText.jsx index 615a43db..6644bffc 100644 --- a/www/main/navigator/shabad/ShabadText.jsx +++ b/www/main/navigator/shabad/ShabadText.jsx @@ -9,7 +9,6 @@ import { ShabadVerse } from '../../common/sttm-ui'; import { changeHomeVerse, changeVerse, - sendToBaniController, filterRequiredVerseItems, udpateHistory, scrollToVerse, @@ -73,7 +72,7 @@ export const ShabadText = ({ const virtuosoRef = useRef(null); const activeVerseRef = useRef(null); - const updateTraversedVerse = (newTraversedVerse, verseIndex, crossPlatformID = null) => { + const updateTraversedVerse = (newTraversedVerse, verseIndex) => { if (isMiscSlide) { setIsMiscSlide(false); } @@ -103,14 +102,6 @@ export const ShabadText = ({ setPaneAttributes, paneAttributes, }); - sendToBaniController(crossPlatformID, filteredItems, newTraversedVerse, baniLength, { - isSundarGutkaBani, - sundarGutkaBaniId, - isCeremonyBani, - ceremonyId, - activeShabadId, - paneAttributes, - }); }; const updateHomeVerse = (verseIndex) => { diff --git a/www/src/scss/styles.scss b/www/src/scss/styles.scss index b54d3b6e..5d187c5a 100644 --- a/www/src/scss/styles.scss +++ b/www/src/scss/styles.scss @@ -155,11 +155,22 @@ button { bottom: 0; height: 100vh; left: 60px; - max-height: 750px; + max-height: 780px; max-width: 850px; overflow: auto; position: fixed; width: calc(100% - 100px); + + .error-msg{ + i { + padding-right: 6px; + } + background: $rust-red; + border-radius: 6px; + color: white; + margin-top: 0; + padding: 6px; + } } .sundar-gutka-wrapper, @@ -606,7 +617,7 @@ button { &.instructions-btn { align-items: center; - background-color: #973737; + background-color: $rust-red; color: white; display: flex; margin: auto; diff --git a/www/src/scss/themes/helpers/_variables.scss b/www/src/scss/themes/helpers/_variables.scss index 4a73d6e2..3776b0ae 100644 --- a/www/src/scss/themes/helpers/_variables.scss +++ b/www/src/scss/themes/helpers/_variables.scss @@ -36,6 +36,7 @@ $bright-red: #ff0000; $cadmium-orange: #e1802f; $princeton-orange: #ff802e; $rust: #b24601; +$rust-red: #973737; $light-green: #27ae60; $apple-green: #65a757;