From 6f7191bd1244645f93d8583f93d8d3a46f2d2c29 Mon Sep 17 00:00:00 2001
From: Markus Koskimies <mkoskim@gmail.com>
Date: Sun, 13 Oct 2024 21:30:13 +0300
Subject: [PATCH] Small fixes (#245)

* Doc info rendering deferred. Doc info does not need realtime rendering.
* Small tweaks
---
 src/gui/app/app.js           |  9 +++++----
 src/gui/common/components.js | 36 ++++++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/gui/app/app.js b/src/gui/app/app.js
index d1932a89..d8d7325d 100644
--- a/src/gui/app/app.js
+++ b/src/gui/app/app.js
@@ -28,6 +28,7 @@ import {
   Inform,
   ListItemText,
   Typography,
+  DeferredRender,
 } from "../common/factory";
 
 import { OpenFolderButton, HeadInfo, WordInfo, CharInfo, WordsToday } from "../common/components";
@@ -291,16 +292,16 @@ function WithDoc({setCommand, doc, updateDoc, recent}) {
     <Separator />
     <ViewSelectButtons selected={doc.ui.view.selected} setSelected={setSelected}/>
     <Separator/>
+    {/* No need for real time rendering */}
+    <DeferredRender>
     <HeadInfo head={head} updateDoc={updateDoc}/>
     <Separator />
     <Filler />
 
     <Separator/>
-    <WordsToday text={text} last={doc.head.last}/>
+    <WordInfo text={text} missing={missing} chars={chars} last={doc.head.last}/>
     <Separator/>
-    <WordInfo text={text} missing={missing}/>
-    <Separator/>
-    <CharInfo chars={chars}/>
+    </DeferredRender>
     {/* <CloseButton setCommand={setCommand}/> */}
 
     <Separator />
diff --git a/src/gui/common/components.js b/src/gui/common/components.js
index 60bfb6ba..0919cb99 100644
--- a/src/gui/common/components.js
+++ b/src/gui/common/components.js
@@ -16,6 +16,7 @@ import {
   TextField,
   Label,
   Accordion, AccordionSummary, AccordionDetails,
+  Separator,
 } from "../common/factory";
 
 import PopupState, { bindTrigger, bindMenu } from 'material-ui-popup-state';
@@ -254,31 +255,38 @@ export class HeadInfo extends React.PureComponent {
   }
 }
 
-export class WordsToday extends React.PureComponent {
+export class WordInfo extends React.PureComponent {
   render() {
-    const {text, last} = this.props;
-    if(!last) return null;
+    const {text, missing, last, chars} = this.props;
 
-    const delta = text - last.text
-    return <Label>Today: {delta >= 0 ? "+" : ""}{delta}</Label>
+    const detail = missing ? `-${missing}` : ""
+
+    return <>
+      Words:&nbsp;<span style={{color: "green"}}>{text}</span>
+      <Separator/>
+      <WordsToday text={text} last={last}/>
+      <Separator/>
+      Target: {text + missing}&nbsp;<span style={{color: "firebrick"}}>{detail}</span>
+      <Separator/>
+      <CharInfo chars={chars}/>
+    </>
   }
 }
 
-export class WordInfo extends React.PureComponent {
+class CharInfo extends React.PureComponent {
   render() {
-    const {text, missing} = this.props;
-
-    const total  = `Words: ${text + missing}`
-    const detail = missing ? ` (${text} / ${missing})` : ""
+    const {chars} = this.props;
 
-    return <Label>{total}{detail}</Label>
+    return <Label>Chars: {chars}</Label>
   }
 }
 
-export class CharInfo extends React.PureComponent {
+class WordsToday extends React.PureComponent {
   render() {
-    const {chars} = this.props;
+    const {text, last} = this.props;
+    if(!last) return null;
 
-    return <Label>Chars: {chars}</Label>
+    const delta = text - last.text
+    return <Label>Today: {delta >= 0 ? "+" : ""}{delta}</Label>
   }
 }