Lock all nodes from being dragged when timer page timer is running

This will be temporary. Ideally, we only want to lock the one that is being timed.
Kyjor · Jan 4, 2024 · 1a4fe54 · 1a4fe54
1 parent 9c1367d
commit 1a4fe54
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/src/components/KanbanBoard/KanbanBoard.jsx b/src/components/KanbanBoard/KanbanBoard.jsx
@@ -138,14 +138,14 @@ class KanbanBoard extends Component {
               >
                 {this.props.parentOrder.map((parentId, index) => {
                   const parent = this.props.parents[parentId];
-
                   return (
                     parent && (
                       <BoardInnerList
                         className="ignoreParent"
                         createNewNode={this.props.createNewNode}
                         deleteNode={this.props.deleteNode}
                         index={index}
+                        isTimerRunning={this.props.isTimerRunning}
                         key={parent.id}
                         mustFocusNodeTitle={this.props.mustFocusNodeTitle}
                         mustFocusParentTitle={this.props.mustFocusParentTitle}

diff --git a/src/main/main.ts b/src/main/main.ts
@@ -241,7 +241,7 @@ function createTimerWindow(node, projectName, stateInit, timerPrefs) {
     width: 275,
     height: 175,
     titleBarStyle: 'customButtonsOnHover',
-    frame: false,
+    frame: true,
     alwaysOnTop: true,
     show: false,
     // resizable: false,

diff --git a/src/pages/ProjectPage/BoardInnerList.jsx b/src/pages/ProjectPage/BoardInnerList.jsx
@@ -11,6 +11,7 @@ class BoardInnerList extends React.PureComponent {
     const {
       createNewNode,
       deleteNode,
+      isTimerRunning,
       showParentModal,
       showModal,
       updateNodeTitle,
@@ -22,6 +23,7 @@ class BoardInnerList extends React.PureComponent {
         nodes={nodes}
         index={index}
         createNewNode={createNewNode}
+        isTimerRunning={isTimerRunning}
         mustFocusNodeTitle={mustFocusNodeTitle}
         saveTime={this.props.saveTime}
         mustFocusParentTitle={mustFocusParentTitle}

diff --git a/src/pages/ProjectPage/ProjectPage.jsx b/src/pages/ProjectPage/ProjectPage.jsx
@@ -379,6 +379,7 @@ class ProjectPage extends Component {
             createNewNode={this.createNewNode}
             deleteNode={this.deleteNode}
             handleAddParent={() => this.createNewParent('New Parent')}
+            isTimerRunning={this.state.isTimerRunning}
             mustFocusNodeTitle={this.state.mustFocusNodeTitle}
             mustFocusParentTitle={this.state.mustFocusParentTitle}
             nodes={this.state.nodes}

diff --git a/src/pages/ProjectPage/node.jsx b/src/pages/ProjectPage/node.jsx
@@ -50,7 +50,7 @@ const Node = (props) => {
     <Draggable
       draggableId={node.id}
       index={props.index}
-      isDragDisabled={isDragDisabled}
+      isDragDisabled={isDragDisabled || props.isTimerRunning}
     >
       {(provided, snapshot) => (
         <div

diff --git a/src/pages/ProjectPage/parent.jsx b/src/pages/ProjectPage/parent.jsx
@@ -56,6 +56,7 @@ class ParentInnerList extends React.Component {
       <>
         {node && (
           <Node
+            isTimerRunning={this.props.isTimerRunning}
             key={node.id}
             node={node}
             index={index}
@@ -159,6 +160,7 @@ const Parent = (props) => {
                   isDraggingOver={snapshot.isDraggingOver}
                 >
                   <ParentInnerList
+                    isTimerRunning={props.isTimerRunning}
                     nodes={nodes}
                     mustFocusNodeTitle={mustFocusNodeTitle}
                     updateNodeTitle={updateNodeTitle}

diff --git a/src/pages/Timer/TimerPage.jsx b/src/pages/Timer/TimerPage.jsx
@@ -130,7 +130,7 @@ class TimerPage extends Component {
     );
 
     sharedIndividualProjectState.setState((state) => {
-      state.timerRunning = false;
+      state.isTimerRunning = false;
     });
   };
 
@@ -155,7 +155,7 @@ class TimerPage extends Component {
     );
 
     sharedIndividualProjectState.setState((state) => {
-      state.timerRunning = true;
+      state.isTimerRunning = true;
     });
   };
 
@@ -211,7 +211,7 @@ class TimerPage extends Component {
               nodes={this.buildTreeData()}
               updateSelectedNode={this.updateSelectedNode}
               currentNode={this.state.currentNodeSelectedInTimer}
-              isTimerRunning={this.state.timerRunning}
+              isTimerRunning={this.state.isTimerRunning}
             />
             <Timer
               endSession={this.endSession}