From a636391b80c222acdeaf804203d07c7863b483a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janis=20Daniel=20Da=CC=88hne?=
<janis.daehne2@student.uni-halle.de>
Date: Tue, 6 Aug 2019 17:40:21 +0200
Subject: [PATCH] - fixed issue #136 - fixed issue where in the site menu
hovering over icons will show hover but clicking will not hide the site menu
---
src/app.tsx | 4 ++--
src/components/commonHeaderBar/commonHeaderBar.tsx | 5 ++---
src/components/siteSideMenu/styles.styl | 2 +-
src/components/sites/doExerciseSite/doExerciseSite.tsx | 2 +-
src/components/sites/doExerciseSite/headerBarContent.tsx | 3 +++
src/constants.ts | 2 +-
src/styles/common.styl | 4 ++++
7 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/app.tsx b/src/app.tsx
index 1b424e06..c90903d4 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -119,7 +119,7 @@ import Chat404 from './components/404internal/Chat404'
const mapStateToProps = (rootState: RootState) => {
return {
userId: rootState.userDataSettingsSate.userData.id,
- isSiteHeaderBarDisplayed: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
+ isSiteHeaderBarDisplayedAndEnabled: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
isSiteHeaderBarCollapsed: rootState.siteHeaderBarState.isSiteHeaderBarCollapsed,
isAddUsersDialogDisplayed: rootState.singleGroupState.isAddUsersDialogDisplayed,
isLogginOut: rootState.siteHeaderBarState.isLoggingOut,
@@ -154,7 +154,7 @@ class App extends React.Component<Props, any> {
<div
- className={this.props.isSiteHeaderBarDisplayed && !this.props.isSiteHeaderBarCollapsed
+ className={this.props.isSiteHeaderBarDisplayedAndEnabled && !this.props.isSiteHeaderBarCollapsed
? 'fh site-content'
: 'fh site-content-no-site-header-bar'}>
<div className="fh relative-positioned">
diff --git a/src/components/commonHeaderBar/commonHeaderBar.tsx b/src/components/commonHeaderBar/commonHeaderBar.tsx
index 774bd3d5..37e63763 100644
--- a/src/components/commonHeaderBar/commonHeaderBar.tsx
+++ b/src/components/commonHeaderBar/commonHeaderBar.tsx
@@ -19,7 +19,7 @@ const mapStateToProps = (rootState: RootState /*, props: MyProps*/) => {
return {
//test0: rootState...
//test: props.test
- isSiteHeaderBarDisplayed: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
+ isSiteHeaderBarDisplayedAndEnabled: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
isSiteHeaderBarCollapsed: rootState.siteHeaderBarState.isSiteHeaderBarCollapsed,
isSubHeaderBarCollapsed: rootState.siteHeaderBarState.isSubHeaderBarCollapsed,
}
@@ -42,10 +42,9 @@ class commonHeaderBar extends React.Component<Props, any> {
return (
<div className="site-content-header-outer">
{
- !this.props.isSubHeaderBarCollapsed &&
<div>
<div
- className={this.props.isSiteHeaderBarDisplayed && !this.props.isSiteHeaderBarCollapsed ? "site-content-header" : 'site-content-header-no-site-header-bar'}>
+ className={`${this.props.isSiteHeaderBarDisplayedAndEnabled && !this.props.isSiteHeaderBarCollapsed ? 'site-content-header' : 'site-content-header-no-site-header-bar'}${this.props.isSubHeaderBarCollapsed ? ' collapsed-i' : ''}`}>
<div className="site-content-header-wrapper">
{
diff --git a/src/components/siteSideMenu/styles.styl b/src/components/siteSideMenu/styles.styl
index 68429858..fcbab1fb 100644
--- a/src/components/siteSideMenu/styles.styl
+++ b/src/components/siteSideMenu/styles.styl
@@ -88,7 +88,7 @@
}
.site-side-menu2-row .body a i {
- margin auto
+ width 100%
}
.site-side-menu2-row .body a span {
diff --git a/src/components/sites/doExerciseSite/doExerciseSite.tsx b/src/components/sites/doExerciseSite/doExerciseSite.tsx
index 5208a0f6..2446916d 100644
--- a/src/components/sites/doExerciseSite/doExerciseSite.tsx
+++ b/src/components/sites/doExerciseSite/doExerciseSite.tsx
@@ -272,7 +272,7 @@ const mapStateToProps = (rootState: RootState /*, props: MyProps*/) => {
isOnGotFocusInterceptionOverlayDisplayed: rootState.doExerciseSiteState.isOnGotFocusInterceptionOverlayDisplayed,
- isSiteHeaderBarDisplayed: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
+ isSiteHeaderBarDisplayedAndEnabled: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
//if this.props.exercisePreview.isStillOpen === false we ignore this flag because we then edit the after solution
lockSolutionsFlagAndIsStillOpen: rootState.doExerciseSiteState.lockSolutionsFlag
&& rootState.doExerciseSiteState.exercisePreviewFrontendTemp !== null && rootState.doExerciseSiteState.exercisePreviewFrontendTemp.isStillOpen,
diff --git a/src/components/sites/doExerciseSite/headerBarContent.tsx b/src/components/sites/doExerciseSite/headerBarContent.tsx
index b993eb94..3d06a24d 100644
--- a/src/components/sites/doExerciseSite/headerBarContent.tsx
+++ b/src/components/sites/doExerciseSite/headerBarContent.tsx
@@ -167,6 +167,9 @@ class HeaderBar extends React.Component<Props, any> {
simulateSaveButtonPress = async (e: ExtendedKeyboardEvent | null) => {
+ if (this.props.isSomeDialogDisplayed) return
+
+ if (this.props.isSomeTestRunning) return
if (this.props.exercisePreview !== null && this.props.exercisePreview.isPermanentlyLocked) {
Logger.log('exercise is permanently locked, cannot save')
diff --git a/src/constants.ts b/src/constants.ts
index 342ad7a9..d5b69604 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -13,7 +13,7 @@ import Logger from './helpers/logger'
* y - breaking changes / new features
* z - fixes, small changes
*/
-export const versionString = '2.4.9'
+export const versionString = '2.4.10'
export const supportMail = 'yapex@informatik.uni-halle.de'
diff --git a/src/styles/common.styl b/src/styles/common.styl
index 895a1255..f6e330f5 100644
--- a/src/styles/common.styl
+++ b/src/styles/common.styl
@@ -385,6 +385,10 @@ html, body {
display none
}
+.collapsed-i {
+ display none !important
+}
+
.default-cursor {
cursor auto !important
}
--
GitLab