dce-reactkit 4.0.0-beta-date-and-time.1 → 4.0.0-beta.1

package/src/components/Modal/index.tsx

@@ -14,9 +14,6 @@ import React, { useState, useEffect, useRef } from 'react';
 import ReactDOM from 'react-dom';
 
 // Import other components
-import LoadingSpinner from '../LoadingSpinner';
-
-// Import helpers
 import waitMs from '../../helpers/waitMs';
 
 // Import types
@@ -44,7 +41,6 @@ const BASE_Z_INDEX_ON_TOP = 2000000000;
 
 // Constants
 const MS_TO_ANIMATE = 200; // Animation duration
-const MS_TO_WAIT_BEFORE_SHOWING_LOADING_INDICATOR = 1000;
 
 // Modal type to list of buttons
 const modalTypeToModalButtonTypes: {
@@ -260,8 +256,6 @@ const Modal: React.FC<ModalProps> = (props) => {
     dontAllowBackdropExit,
     dontShowXButton,
     onTopOfOtherModals,
-    isLoading,
-    isLoadingCancelable,
   } = props;
 
   // Determine if no header either
@@ -272,7 +266,6 @@ const Modal: React.FC<ModalProps> = (props) => {
   // True if animation is in use
   const [animatingIn, setAnimatingIn] = useState(true);
   const [animatingPop, setAnimatingPop] = useState(false);
-  const [showModal, setShowModal] = useState(false);
 
   /* -------------- Refs -------------- */
 
@@ -305,15 +298,6 @@ const Modal: React.FC<ModalProps> = (props) => {
         if (mounted.current) {
           setAnimatingIn(false);
         }
-        if (isLoading) {
-          // wait before showing modal
-          await waitMs(MS_TO_WAIT_BEFORE_SHOWING_LOADING_INDICATOR);
-          if (mounted.current) {
-            setShowModal(true);
-          }
-        } else {
-          setShowModal(true);
-        }
       })();
 
       return () => {
@@ -416,17 +400,6 @@ const Modal: React.FC<ModalProps> = (props) => {
     animationClass = 'Modal-animating-pop';
   }
 
-  // default to show close button when not loading and not show close button when loading
-  // unless downShowXButton or isLoadingCancelable
-  const showCloseButton = (
-    // The modal must have an onClose function
-    onClose
-    // ...and the close button is allowed to be visible
-    && !dontShowXButton
-    // ...and should not be shown if the modal is loading and not cancelable
-    && !(isLoading && !isLoadingCancelable)
-  );
-
   // Render the modal
   const contentToRender = (
     <div
@@ -463,8 +436,6 @@ const Modal: React.FC<ModalProps> = (props) => {
           handleClose(ModalButtonType.Cancel);
         }}
       />
-
-      {showModal && (
       <div
         className={`modal-dialog modal-${size} ${animationClass} modal-dialog-scrollable modal-dialog-centered`}
         style={{
@@ -527,7 +498,7 @@ const Modal: React.FC<ModalProps> = (props) => {
                 {title}
               </h5>
 
-              {showCloseButton && (
+              {(onClose && !dontShowXButton) && (
                 <button
                   type="button"
                   className="Modal-x-button btn-close"
@@ -547,34 +518,25 @@ const Modal: React.FC<ModalProps> = (props) => {
               )}
             </div>
           )}
-
-          <div
-            className="modal-body"
-            style={{
-              color: (
-                isDarkModeOn()
-                  ? 'white'
-                  : undefined
-              ),
-              backgroundColor: (
-                isDarkModeOn()
-                  ? '#444'
-                  : undefined
-              ),
-            }}
-          >
-            {
-              isLoading
-                ? (
-                  <>
-                    <LoadingSpinner />
-                    <span className="sr-only">Content loading</span>
-                  </>
-                )
-                : children
-            }
-          </div>
-
+          {children && (
+            <div
+              className="modal-body"
+              style={{
+                color: (
+                  isDarkModeOn()
+                    ? 'white'
+                    : undefined
+                ),
+                backgroundColor: (
+                  isDarkModeOn()
+                    ? '#444'
+                    : undefined
+                ),
+              }}
+            >
+              {children}
+            </div>
+          )}
           {footer && (
             <div
               className="modal-footer pt-1 pb-1"
@@ -601,7 +563,6 @@ const Modal: React.FC<ModalProps> = (props) => {
           )}
         </div>
       </div>
-      )}
     </div>
   );
 

package/src/components/SimpleDateChooser.tsx

@@ -1,23 +1,16 @@
 /**
  * A very simple, lightweight date chooser
  * @author Gabe Abrams
- * @author Gardeniu Liu
  */
 
 // Import React
 import React from 'react';
+import getMonthName from '../helpers/getMonthName';
 
 // Import helpers
 import getOrdinal from '../helpers/getOrdinal';
-import getMonthName from '../helpers/getMonthName';
 import getTimeInfoInET from '../helpers/getTimeInfoInET';
 
-// Import classes
-import ErrorWithCode from '../errors/ErrorWithCode';
-
-// Import types
-import ReactKitErrorCode from '../types/ReactKitErrorCode';
-
 /*------------------------------------------------------------------------*/
 /* -------------------------------- Types ------------------------------- */
 /*------------------------------------------------------------------------*/
@@ -40,14 +33,12 @@ type Props = {
    * @param year new full year number
    */
   onChange: (month: number, day: number, year: number) => void,
-  // Number of months in either the past or future to allow the user to choose from
-  // If we aren't allowing the past or the future, we will throw an error
-  // (max is 12, default is 6 in the past and 6 in the future)
+  // Number of months to allow the user to choose from
+  // (max is 12, default is 6)
   numMonthsToShow?: number,
-  // If true, the user isn't allowed to select dates in the past
-  dontAllowPast?: boolean,
-  // If true, the user isn't allowed to select dates in the future
-  dontAllowFuture?: boolean,
+  // If true, instead of showing numMonthsToShow months into the future,
+  // show numMonthsToShow months into the past
+  chooseFromPast?: boolean,
 };
 
 /*------------------------------------------------------------------------*/
@@ -65,9 +56,8 @@ const SimpleDateChooser: React.FC<Props> = (props) => {
     ariaLabel,
     name,
     onChange,
+    chooseFromPast,
     numMonthsToShow = 6,
-    dontAllowFuture,
-    dontAllowPast,
   } = props;
 
   /*------------------------------------------------------------------------*/
@@ -86,41 +76,16 @@ const SimpleDateChooser: React.FC<Props> = (props) => {
     days: number[],
     year: number,
   }[] = [];
-
   let startYear = today.year;
   let startMonth = today.month;
-
-  // Don't allow past or future dates
-  if (dontAllowPast && dontAllowFuture) {
-    throw new ErrorWithCode(
-      'No past or future dates allowed',
-      ReactKitErrorCode.SimpleDateChooserInvalidDateRange,
-    );
-  }
-
-  // Require numMonthsToShow to be positive
-  if (numMonthsToShow <= 0) {
-    throw new ErrorWithCode(
-      'numMonthsToShow must be positive',
-      ReactKitErrorCode.SimpleDateChooserInvalidNumMonths,
-    );
-  }
-
-  // Recalculate startMonth and startYear when allowing past dates
-  if (!dontAllowPast) {
+  if (chooseFromPast) {
     startMonth -= Math.max(0, numMonthsToShow - 1);
     while (startMonth <= 0) {
       startMonth += 12;
       startYear -= 1;
     }
   }
-  // Calculate total number of months to show
-  let totalMonthsToShow = numMonthsToShow;
-  if (!dontAllowPast && !dontAllowFuture) {
-    totalMonthsToShow = totalMonthsToShow * 2 - 1;
-  }
-
-  for (let i = 0; i < totalMonthsToShow; i++) {
+  for (let i = 0; i < numMonthsToShow; i++) {
     // Get month and year info
     const unmoddedMonth = (startMonth + i);
     let month = unmoddedMonth;
@@ -140,25 +105,24 @@ const SimpleDateChooser: React.FC<Props> = (props) => {
     // Figure out which days are allowed
     const days = [];
     const numDaysInMonth = (new Date(year, month, 0)).getDate();
-
-    // Current month
-    if (month === today.month && year === today.year) {
-      // Past selection: add all previous days of the month
-      if (!dontAllowPast) {
-        for (let day = 1; day < today.day; day++) {
-          days.push(day);
-        }
+    if (chooseFromPast) {
+      // Past selection
+      const numDaysToAdd = (
+        (month === today.month)
+          ? today.day // Current month, only add up to today
+          : numDaysInMonth // Past month, add all days
+      );
+      for (let day = 1; day <= numDaysToAdd; day++) {
+        days.push(day);
       }
-      days.push(today.day); // Add current day
+    } else {
       // Future selection: add all remaining days of the month
-      if (!dontAllowFuture) {
-        for (let day = today.day + 1; day <= numDaysInMonth; day++) {
-          days.push(day);
-        }
-      }
-    } else { // Past or future month
-      // Include all days in the month
-      for (let day = 1; day <= numDaysInMonth; day++) {
+      const firstDay = (
+        month === today.month
+          ? today.day // Current month: start at current date
+          : 1 // Future month: start at beginning of month
+      );
+      for (let day = firstDay; day <= numDaysInMonth; day++) {
         days.push(day);
       }
     }
@@ -194,8 +158,8 @@ const SimpleDateChooser: React.FC<Props> = (props) => {
       </option>,
     );
 
-    // This is the currently selected month
     if (month === choice.month) {
+      // This is the currently selected month
       // Create day options
       choice.days.forEach((dayChoice) => {
         const ordinal = getOrdinal(dayChoice);

package/src/components/TabBox.tsx

@@ -15,8 +15,6 @@ type Props = {
   title: React.ReactNode,
   // Children/contents inside the box
   children: React.ReactNode,
-  // Children to display on the top right of the tab box
-  topRightChildren?: React.ReactNode,
   // If true, don't add margin below the tab box
   noBottomMargin?: boolean,
   // If true, don't add padding to bottom of tab box
@@ -51,9 +49,7 @@ const style = `
 
   /* Container for Title */
   .TabBox-title-container {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+    /* Place on Left */
     position: relative;
     left: 0;
     text-align: left;
@@ -86,19 +82,6 @@ const style = `
     background: #fdfdfd;
   }
 
-  .TabBox-title-right-container {
-    display: flex;
-    flex-direction: row;
-    align-items: bottom;
-    height: 2.4rem;
-    overflow: visible;
-  }
-
-  .TabBox-title-right-contents {
-    margin-right: 0.5rem;
-    margin-bottom: 0.2rem;
-  }
-
   /* Make the TabBox's Children Appear Above Title if Overlap Occurs */
   .TabBox-children {
     position: relative;
@@ -115,10 +98,11 @@ const TabBox: React.FC<Props> = (props) => {
   /* -------------------------------- Setup ------------------------------- */
   /*------------------------------------------------------------------------*/
 
+  /* -------------- Props ------------- */
+
   const {
     title,
     children,
-    topRightChildren,
     noBottomPadding,
     noBottomMargin,
   } = props;
@@ -127,23 +111,21 @@ const TabBox: React.FC<Props> = (props) => {
   /* ------------------------------- Render ------------------------------- */
   /*------------------------------------------------------------------------*/
 
+  /*----------------------------------------*/
+  /* --------------- Main UI -------------- */
+  /*----------------------------------------*/
+
+  // Full UI
   return (
     <div className={`TabBox-container ${noBottomMargin ? '' : 'mb-2'}`}>
       {/* Style */}
       <style>{style}</style>
 
-      {/* Title Row with Left and Right sections */}
+      {/* Title */}
       <div className="TabBox-title-container">
         <div className="TabBox-title">
           {title}
         </div>
-        {topRightChildren && (
-          <div className="TabBox-title-right-container">
-            <div className="TabBox-title-right-contents">
-              {topRightChildren}
-            </div>
-          </div>
-        )}
       </div>
 
       {/* Contents */}

package/src/components/Tooltip.tsx

@@ -15,7 +15,7 @@ type Props = {
   // Text of the tooltip
   text: string,
   // Children to wrap in the tooltip
-  children: any,
+  children: JSX.Element,
 };
 
 /*------------------------------------------------------------------------*/

package/src/index.ts

@@ -15,7 +15,6 @@ import RadioButton from './components/RadioButton';
 import CheckboxButton from './components/CheckboxButton';
 import ButtonInputGroup from './components/ButtonInputGroup';
 import SimpleDateChooser from './components/SimpleDateChooser';
-import SimpleTimeChooser from './components/SimpleTimeChooser';
 import Drawer from './components/Drawer';
 import PopSuccessMark from './components/PopSuccessMark';
 import PopFailureMark from './components/PopFailureMark';
@@ -39,9 +38,6 @@ import ErrorWithCode from './errors/ErrorWithCode';
 import MINUTE_IN_MS from './constants/MINUTE_IN_MS';
 import HOUR_IN_MS from './constants/HOUR_IN_MS';
 import DAY_IN_MS from './constants/DAY_IN_MS';
-import LOG_REVIEW_ROUTE_PATH_PREFIX from './constants/LOG_REVIEW_ROUTE_PATH_PREFIX';
-import LOG_ROUTE_PATH from './constants/LOG_ROUTE_PATH';
-import LOG_REVIEW_STATUS_ROUTE from './constants/LOG_REVIEW_STATUS_ROUTE';
 
 // Import dynamic constants
 import DynamicWord from './dynamicConstants/DynamicWord';
@@ -92,7 +88,6 @@ import mapAsync from './helpers/asyncArrayFunctions/mapAsync';
 import someAsync from './helpers/asyncArrayFunctions/someAsync';
 import capitalize from './helpers/capitalize';
 import shuffleArray from './helpers/shuffleArray';
-import getWordCount from './helpers/getWordCount';
 
 // Import types
 import ParamType from './types/ParamType';
@@ -134,7 +129,6 @@ export {
   CheckboxButton,
   ButtonInputGroup,
   SimpleDateChooser,
-  SimpleTimeChooser,
   Drawer,
   PopSuccessMark,
   PopFailureMark,
@@ -161,9 +155,6 @@ export {
   MINUTE_IN_MS,
   HOUR_IN_MS,
   DAY_IN_MS,
-  LOG_REVIEW_ROUTE_PATH_PREFIX,
-  LOG_ROUTE_PATH,
-  LOG_REVIEW_STATUS_ROUTE,
   // Dynamic Constants
   DynamicWord,
   // Helpers
@@ -207,7 +198,6 @@ export {
   someAsync,
   capitalize,
   shuffleArray,
-  getWordCount,
   // Client helpers
   initClient,
   visitServerEndpoint,

package/src/types/ReactKitErrorCode.tsx

@@ -1,4 +1,4 @@
-// Highest error code = DRK36
+// Highest error code = DRK34
 
 /**
  * List of error codes built into the react kit
@@ -9,8 +9,6 @@ enum ReactKitErrorCode {
   NoCode = 'DRK2',
   SessionExpired = 'DRK3',
   NoCACCLSendRequestFunction = 'DRK7',
-  SimpleDateChooserInvalidDateRange = 'DRK35',
-  SimpleDateChooserInvalidNumMonths = 'DRK36',
 }
 
 export default ReactKitErrorCode;

package/dist/cjs/types/components/SimpleTimeChooser.d.ts

@@ -1,20 +0,0 @@
-/**
- * A very simple, lightweight time chooser
- * @author Gardenia Liu
- */
-import React from 'react';
-type Props = {
-    ariaLabel: string;
-    name: string;
-    hour: number;
-    minute: number;
-    /**
-     * Handler for when time changes
-     * @param hour new 24hr hour number
-     * @param minute new minute number
-     */
-    onChange: (hour: number, minute: number) => void;
-    intervalMin?: number;
-};
-declare const SimpleTimeChooser: React.FC<Props>;
-export default SimpleTimeChooser;

package/dist/cjs/types/helpers/getWordCount.d.ts

@@ -1,10 +0,0 @@
-/**
- * Get number of words in string
- * @author Gardenia Liu
- * @author Allison Zhang
- * @author Gabe Abrams
- * @param text the string to check
- * @returns number of words in the string
- */
-declare const getWordCount: (text: string) => number;
-export default getWordCount;

package/dist/esm/types/components/SimpleTimeChooser.d.ts

@@ -1,20 +0,0 @@
-/**
- * A very simple, lightweight time chooser
- * @author Gardenia Liu
- */
-import React from 'react';
-type Props = {
-    ariaLabel: string;
-    name: string;
-    hour: number;
-    minute: number;
-    /**
-     * Handler for when time changes
-     * @param hour new 24hr hour number
-     * @param minute new minute number
-     */
-    onChange: (hour: number, minute: number) => void;
-    intervalMin?: number;
-};
-declare const SimpleTimeChooser: React.FC<Props>;
-export default SimpleTimeChooser;

package/dist/esm/types/helpers/getWordCount.d.ts

@@ -1,10 +0,0 @@
-/**
- * Get number of words in string
- * @author Gardenia Liu
- * @author Allison Zhang
- * @author Gabe Abrams
- * @param text the string to check
- * @returns number of words in the string
- */
-declare const getWordCount: (text: string) => number;
-export default getWordCount;