Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-03-11 21:27:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #80 from Stremio/settings-fixes

Browse source 
dataset attribute instead of data-name used for Multiselect/ColorInput
This commit is contained in:
Nikola Hristov 2019-12-09 13:19:38 +02:00 committed by GitHub
commit aba6685002
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/routes/Settings/SectionsList/SectionsList.js
View file

@ -165,11 +165,11 @@ const SectionsList = React.forwardRef(({ className, sections, preferences, onPre
<React.Fragment>
<div className={classnames(styles['input-container'], styles['select-container'])}>
<div className={styles['input-header']}>Caching</div>
<Multiselect options={cachingOptions} selected={[preferences.streaming.cacheSize]} data-name={'cacheSize'} className={styles['dropdown']} onSelect={updateStreamingDropdown} />
<Multiselect options={cachingOptions} selected={[preferences.streaming.cacheSize]} dataset={{ name: 'cacheSize' }} className={styles['dropdown']} onSelect={updateStreamingDropdown} />
</div>
<div className={classnames(styles['input-container'], styles['select-container'])}>
<div className={styles['input-header']}>Torrent Profile</div>
<Multiselect options={streamingProfiles} selected={[preferences.streaming.profile]} data-name={'profile'} className={styles['dropdown']} onSelect={updateStreamingDropdown} />
<Multiselect options={streamingProfiles} selected={[preferences.streaming.profile]} dataset={{ name: 'profile' }} className={styles['dropdown']} onSelect={updateStreamingDropdown} />
</div>
</React.Fragment>
}
@ -193,7 +193,7 @@ const SectionsList = React.forwardRef(({ className, sections, preferences, onPre
return (
<div key={input.id} className={classnames(styles['input-container'], styles['select-container'])}>
{input.header ? <div className={styles['input-header']}>{input.header}</div> : null}
<Multiselect options={input.options} selected={[preferences[input.id]]} data-name={input.id} key={input.id} className={styles['dropdown']} onSelect={updateDropdown} />
<Multiselect options={input.options} selected={[preferences[input.id]]} dataset={{ name: input.id }} key={input.id} className={styles['dropdown']} onSelect={updateDropdown} />
</div>
);
} else if (input.type === 'link') {
@ -238,7 +238,7 @@ const SectionsList = React.forwardRef(({ className, sections, preferences, onPre
return (
<div key={input.id} className={classnames(styles['input-container'], styles['color-container'])}>
{input.header ? <div className={styles['input-header']}>{input.header}</div> : null}
<ColorInput className={styles['color-picker']} data-id={input.id} value={preferences[input.id]} onChange={colorChanged} />
<ColorInput className={styles['color-picker']} dataset={{ id: input.id }} value={preferences[input.id]} onChange={colorChanged} />
</div>
);
} else if (input.type === 'info') {

4
src/routes/Settings/Settings.js
View file

@ -10,7 +10,7 @@ const Settings = () => {
const [preferences, setPreferences] = useSettings();
const [dynamicSections, setDynamicSections] = React.useState(settingsSections);
// TODO: The Streaming section should be handled separately
const sections = React.useMemo(()=>Object.keys(dynamicSections)
const sections = React.useMemo(() => Object.keys(dynamicSections)
.map((section) => ({
id: section,
inputs: dynamicSections[section],
@ -39,7 +39,7 @@ const Settings = () => {
if (scrollContainer.scrollTop + scrollContainer.clientHeight === scrollContainer.scrollHeight) {
setSelectedSectionId(sections[sections.length - 1].id);
} else {
for (let i = sections.length - 1;i >= 0;i--) {
for (let i = sections.length - 1; i >= 0; i--) {
if (sections[i].ref.current.offsetTop <= scrollContainer.scrollTop) {
setSelectedSectionId(sections[i].id);
break;