correct toggle methods namings

This commit is contained in:
srgooglo 2022-05-31 02:10:35 +02:00
parent d9525c597a
commit 249bc5ab66
4 changed files with 32 additions and 23 deletions

View File

@ -19,18 +19,18 @@ export default class BottomBar extends EviteComponent {
handleBusEvents = { handleBusEvents = {
"app.render_initialization": () => { "app.render_initialization": () => {
this.toogle(false) this.toggle(false)
}, },
"app.render_initialization_done": () => { "app.render_initialization_done": () => {
if (this.isAllowed()) { if (this.isAllowed()) {
this.toogle(true) this.toggle(true)
} }
}, },
"app.crash": () => { "app.crash": () => {
this.toogle(false) this.toggle(false)
}, },
"locationChange": () => { "locationChange": () => {
this.toogle(this.isAllowed()) this.toggle(this.isAllowed())
} }
} }
@ -38,7 +38,7 @@ export default class BottomBar extends EviteComponent {
this._loadBusEvents() this._loadBusEvents()
window.app.BottomBarController = { window.app.BottomBarController = {
toogleVisible: this.toogle, toogleVisible: this.toggle,
isVisible: () => this.state.visible, isVisible: () => this.state.visible,
render: (fragment) => { render: (fragment) => {
this.setState({ render: fragment }) this.setState({ render: fragment })
@ -58,7 +58,7 @@ export default class BottomBar extends EviteComponent {
return app.pageStatement?.bottomBarAllowed !== "undefined" && app.pageStatement?.bottomBarAllowed !== false return app.pageStatement?.bottomBarAllowed !== "undefined" && app.pageStatement?.bottomBarAllowed !== false
} }
toogle = (to) => { toggle = (to) => {
if (!window.isMobile) { if (!window.isMobile) {
to = false to = false
} else { } else {

View File

@ -65,11 +65,11 @@ export default class SidebarEditor extends React.Component {
onSave = () => { onSave = () => {
window.app.settings.set("sidebarKeys", this.state.items) window.app.settings.set("sidebarKeys", this.state.items)
window.app.SidebarController.toogleEdit(false) window.app.SidebarController.toggleEdit(false)
} }
onDiscard = () => { onDiscard = () => {
window.app.SidebarController.toogleEdit(false) window.app.SidebarController.toggleEdit(false)
} }
onSetDefaults = () => { onSetDefaults = () => {

View File

@ -25,7 +25,7 @@ export default class Sidebar extends React.Component {
this.state = { this.state = {
editMode: false, editMode: false,
visible: true, visible: false,
loading: true, loading: true,
collapsed: window.app.settings.get("collapseOnLooseFocus") ?? false, collapsed: window.app.settings.get("collapseOnLooseFocus") ?? false,
pathResolve: {}, pathResolve: {},
@ -37,26 +37,31 @@ export default class Sidebar extends React.Component {
} }
this.SidebarController = { this.SidebarController = {
toogleVisible: (to) => { toggleVisibility: this.toggleVisibility,
this.setState({ visible: to ?? !this.state.visible }) toggleEdit: this.toggleEditMode,
},
toogleEdit: this.toogleEditMode,
isVisible: () => this.state.visible, isVisible: () => this.state.visible,
isEditMode: () => this.state.visible, isEditMode: () => this.state.visible,
isCollapsed: () => this.state.collapsed, isCollapsed: () => this.state.collapsed,
} }
window.app["SidebarController"] = this.SidebarController window.app["SidebarController"] = this.SidebarController
window.app.eventBus.on("edit_sidebar", () => this.toogleEditMode())
window.app.eventBus.on("edit_sidebar", () => this.toggleEditMode())
window.app.eventBus.on("settingChanged.sidebar_collapse", (value) => { window.app.eventBus.on("settingChanged.sidebar_collapse", (value) => {
this.toogleCollapse(value) this.toggleCollapse(value)
}) })
} }
collapseDebounce = null collapseDebounce = null
componentDidMount = () => { componentDidMount = async () => {
this.loadSidebarItems() await this.loadSidebarItems()
// create a cool debounced animation
setTimeout(() => {
this.toggleVisibility(true)
}, 400)
} }
getStoragedKeys = () => { getStoragedKeys = () => {
@ -206,7 +211,7 @@ export default class Sidebar extends React.Component {
return window.app.setLocation(`/${e.key}`, 150) return window.app.setLocation(`/${e.key}`, 150)
} }
toogleEditMode = (to) => { toggleEditMode = (to) => {
if (typeof to === "undefined") { if (typeof to === "undefined") {
to = !this.state.editMode to = !this.state.editMode
} }
@ -222,12 +227,16 @@ export default class Sidebar extends React.Component {
this.setState({ editMode: to, collapsed: false }) this.setState({ editMode: to, collapsed: false })
} }
toogleCollapse = (to) => { toggleCollapse = (to) => {
if (!this.state.editMode) { if (!this.state.editMode) {
this.setState({ collapsed: to ?? !this.state.collapsed }) this.setState({ collapsed: to ?? !this.state.collapsed })
} }
} }
toggleVisibility = (to) => {
this.setState({ visible: to ?? !this.state.visible })
}
onMouseEnter = () => { onMouseEnter = () => {
if (window.app.settings.is("collapseOnLooseFocus", false)) { if (window.app.settings.is("collapseOnLooseFocus", false)) {
return false return false
@ -237,7 +246,7 @@ export default class Sidebar extends React.Component {
this.collapseDebounce = null this.collapseDebounce = null
if (this.state.collapsed) { if (this.state.collapsed) {
this.toogleCollapse(false) this.toggleCollapse(false)
} }
} }
@ -247,7 +256,7 @@ export default class Sidebar extends React.Component {
} }
if (!this.state.collapsed) { if (!this.state.collapsed) {
this.collapseDebounce = setTimeout(() => { this.toogleCollapse(true) }, window.app.settings.get("autoCollapseDelay") ?? 500) this.collapseDebounce = setTimeout(() => { this.toggleCollapse(true) }, window.app.settings.get("autoCollapseDelay") ?? 500)
} }
} }

View File

@ -61,7 +61,7 @@ export default class StreamViewer extends React.Component {
// make the interface a bit confortable for a video player // make the interface a bit confortable for a video player
app.ThemeController.applyVariant("dark") app.ThemeController.applyVariant("dark")
app.eventBus.emit("toogleCompactMode", true) app.eventBus.emit("toogleCompactMode", true)
app.SidebarController.toogleVisible(false) app.SidebarController.tooggleVisibility(false)
app.HeaderController.toogleVisible(false) app.HeaderController.toogleVisible(false)
// fetch user info in the background // fetch user info in the background
@ -80,7 +80,7 @@ export default class StreamViewer extends React.Component {
componentWillUnmount = () => { componentWillUnmount = () => {
app.ThemeController.applyVariant(app.settings.get("themeVariant")) app.ThemeController.applyVariant(app.settings.get("themeVariant"))
app.eventBus.emit("toogleCompactMode", false) app.eventBus.emit("toogleCompactMode", false)
app.SidebarController.toogleVisible(true) app.SidebarController.toggleVisibility(true)
app.HeaderController.toogleVisible(true) app.HeaderController.toogleVisible(true)
app.HeaderController.toogleVisible(true) app.HeaderController.toogleVisible(true)