tweak: Active and Past detours use edited directions

assets/css/_autosized_textarea.scss

@@ -0,0 +1,28 @@
+.c-autosized-textarea {
+  display: grid;
+  // The main area that the textarea and the "'Sizer" occupy
+  grid-template-areas: "slot";
+
+  &::after, // "Sizer"
+  > textarea {
+    grid-area: slot;
+  }
+
+  &::after {
+    content: attr(data-replicated-value) " ";
+    white-space: pre-wrap;
+    visibility: hidden;
+  }
+  > textarea {
+    resize: none;
+    overflow: hidden;
+  }
+  &::after,
+  > textarea {
+    border: 1px solid $list-group-border-color;
+    padding: 0.5rem;
+    font: inherit;
+    margin-bottom: 1rem;
+    line-height: 1.5rem;
+  }
+}

assets/css/app.scss

@@ -31,6 +31,7 @@ $vpp-location-padding: 1rem;
 @import "leaflet";
 @import "skate_ui";
 
+@import "autosized_textarea";
 @import "basic_notification_modal";
 @import "circle_x_icon";
 @import "card";

assets/src/components/detours/detourPanels/activeDetourPanel.tsx

@@ -17,7 +17,7 @@ import {
 import inTestGroup, { TestGroups } from "../../../userInTestGroup"
 
 export interface ActiveDetourPanelProps extends PropsWithChildren {
-  detourText: string
+  copyableDetourText: string
   directions?: DetourDirection[]
   connectionPoints?: [string, string]
   missedStops?: Stop[]
@@ -30,7 +30,7 @@ export interface ActiveDetourPanelProps extends PropsWithChildren {
 }
 
 export const ActiveDetourPanel = ({
-  detourText,
+  copyableDetourText,
   directions,
   connectionPoints,
   missedStops,
@@ -63,7 +63,7 @@ export const ActiveDetourPanel = ({
         {backButton}
         {/* TODO: temporary test group until I get the copy logic hooked up */}
         {inTestGroup(TestGroups.CopyButton) && (
-          <CopyButton detourText={detourText} />
+          <CopyButton detourText={copyableDetourText} />
         )}
       </Panel.Header>
 

assets/src/components/detours/detourPanels/detourFinishedPanel.tsx

@@ -2,26 +2,37 @@ import React, { PropsWithChildren } from "react"
 import { Button, Form } from "react-bootstrap"
 import * as BsIcons from "../../../helpers/bsIcons"
 import { Panel } from "../diversionPage"
-import { CopyButton } from "../detourPanelComponents"
+import {
+  ConnectionPoints,
+  CopyButton,
+  MissedStops,
+} from "../detourPanelComponents"
+import { Stop } from "../../../schedule"
 
 interface DetourFinishedPanelProps extends PropsWithChildren {
   onNavigateBack: () => void
-  detourText: string
+  copyableDetourText: string
+  editableDirections: string
+  connectionPoints?: [string, string]
+  missedStops?: Stop[]
   onChangeDetourText: (value: string) => void
   onActivateDetour?: () => void
 }
 
 export const DetourFinishedPanel = ({
   onNavigateBack,
-  detourText,
+  copyableDetourText,
+  editableDirections,
+  connectionPoints,
+  missedStops,
   onChangeDetourText,
   onActivateDetour,
   children,
 }: DetourFinishedPanelProps) => (
   <Panel as="article" className="c-diversion-panel">
     <Panel.Header>
       <h1 className="c-diversion-panel__h1 my-3">View Draft Detour</h1>
-      <CopyButton detourText={detourText} />
+      <CopyButton detourText={copyableDetourText} />
     </Panel.Header>
 
     <Panel.Body className="d-flex flex-column">
@@ -35,15 +46,32 @@ export const DetourFinishedPanel = ({
           <BsIcons.ArrowLeft /> Edit
         </Button>
 
-        <Form.Control
-          as="textarea"
-          value={detourText}
-          onChange={({ target: { value } }) => onChangeDetourText(value)}
-          className="flex-grow-1 mb-3"
-          style={{
-            resize: "none",
-          }}
-        />
+        <h2 className="c-diversion-panel__h2">Directions</h2>
+        {/* 
+            We need a way to let the form area take up exactly the space of its content
+            (to avoid double scrollbars). We used this approach:
+            https://css-tricks.com/the-cleanest-trick-for-autogrowing-textareas
+
+            The result is that the Form.Control has an invisible twin that helps the 
+            wrapper grow to the appropriate size, and then the Form.Control likewise 
+            assumes that space. All formatting between the Form.Control and the ::after
+            pseudo-element must be identical: border, padding, margin, font.
+        */}
+        <div
+          className="c-autosized-textarea"
+          data-replicated-value={editableDirections}
+        >
+          <Form.Control
+            as="textarea"
+            value={editableDirections}
+            onChange={({ target: { value } }) => onChangeDetourText(value)}
+          />
+        </div>
+
+        {connectionPoints && (
+          <ConnectionPoints connectionPoints={connectionPoints} />
+        )}
+        {missedStops && <MissedStops missedStops={missedStops} />}
       </Panel.Body.ScrollArea>
 
       <Panel.Body.Footer className="d-flex flex-column">

assets/src/components/detours/detourPanels/pastDetourPanel.tsx

@@ -13,7 +13,7 @@ import {
 import inTestGroup, { TestGroups } from "../../../userInTestGroup"
 
 export interface PastDetourPanelProps {
-  detourText: string
+  copyableDetourText: string
   directions?: DetourDirection[]
   connectionPoints: [string, string]
   missedStops?: Stop[]
@@ -25,7 +25,7 @@ export interface PastDetourPanelProps {
 }
 
 export const PastDetourPanel = ({
-  detourText,
+  copyableDetourText,
   directions,
   connectionPoints,
   missedStops,
@@ -40,7 +40,7 @@ export const PastDetourPanel = ({
       <h1 className="c-diversion-panel__h1 my-3">View Past Detour</h1>
       {/* TODO: temporary test group until I get the copy logic hooked up */}
       {inTestGroup(TestGroups.CopyButton) && (
-        <CopyButton detourText={detourText} />
+        <CopyButton detourText={copyableDetourText} />
       )}
     </Panel.Header>
 

assets/src/components/detours/diversionPage.tsx

@@ -3,7 +3,6 @@ import React, {
   ComponentPropsWithoutRef,
   PropsWithChildren,
   useContext,
-  useEffect,
   useState,
 } from "react"
 import { DrawDetourPanel } from "./detourPanels/drawDetourPanel"
@@ -50,6 +49,10 @@ const displayFieldsFromRouteAndPattern = (
   return { routeName, routeDirection, routeOrigin, routeDescription, shape }
 }
 
+const parseIntoDirectionsList = (directions: string) => {
+  return directions.split("\n").map((direction) => ({ instruction: direction }))
+}
+
 interface DiversionPageFunctions {
   onClose: () => void
 }
@@ -113,16 +116,15 @@ export const DiversionPage = ({
       : { input: useDetourProps.originalRoute }
   )
 
-  const [textArea, setTextArea] = useState("")
-
   const nearestIntersectionDirection = [
     { instruction: "From " + nearestIntersection },
   ]
   const extendedDirections = directions
     ? nearestIntersectionDirection.concat(directions)
     : undefined
 
-  const { route, routePattern, routePatterns } = snapshot.context
+  const { route, routePattern, routePatterns, editedDirections } =
+    snapshot.context
   const routePatternsById = Object.fromEntries(
     routePatterns?.map((rp) => [rp.id, rp]) ?? []
   )
@@ -137,35 +139,20 @@ export const DiversionPage = ({
     ? displayFieldsFromRouteAndPattern(route, routePattern)
     : {}
 
-  useEffect(() => {
-    if (snapshot.matches({ "Detour Drawing": "Share Detour" })) {
-      setTextArea(
-        [
-          `Detour ${routeName} ${routeDirection}`,
-          routeOrigin,
-          ,
-          "Connection Points:",
-          connectionPoints?.start?.name ?? "N/A",
-          connectionPoints?.end?.name ?? "N/A",
-          ,
-          `Missed Stops (${missedStops?.length}):`,
-          ...(missedStops?.map(({ name }) => name) ?? ["no stops"]),
-          ,
-          "Turn-by-Turn Directions:",
-          ...(extendedDirections?.map((v) => v.instruction) ?? []),
-        ].join("\n")
-      )
-    }
-  }, [
-    snapshot,
-    routeName,
-    routeDirection,
+  const copyableDetourText = [
+    `Detour ${routeName} ${routeDirection}`,
     routeOrigin,
-    extendedDirections,
-    missedStops,
-    connectionPoints?.start?.name,
-    connectionPoints?.end?.name,
-  ])
+    ,
+    "Connection Points:",
+    connectionPoints?.start?.name ?? "N/A",
+    connectionPoints?.end?.name ?? "N/A",
+    ,
+    `Missed Stops (${missedStops?.length}):`,
+    ...(missedStops?.map(({ name }) => name) ?? ["no stops"]),
+    ,
+    "Turn-by-Turn Directions:",
+    ...(extendedDirections?.map((v) => v.instruction) ?? []),
+  ].join("\n")
 
   const routes = useContext(RoutesContext)
   const epochNowInSeconds = useCurrentTimeSeconds()
@@ -260,8 +247,16 @@ export const DiversionPage = ({
       return (
         <DetourFinishedPanel
           onNavigateBack={editDetour}
-          detourText={textArea}
-          onChangeDetourText={setTextArea}
+          copyableDetourText={copyableDetourText}
+          editableDirections={editedDirections || ""}
+          connectionPoints={[
+            connectionPoints?.start?.name ?? "N/A",
+            connectionPoints?.end?.name ?? "N/A",
+          ]}
+          missedStops={missedStops}
+          onChangeDetourText={(detourText: string) =>
+            send({ type: "detour.share.edit-directions", detourText })
+          }
           onActivateDetour={
             inTestGroup(TestGroups.DetoursList)
               ? () => {
@@ -345,8 +340,12 @@ export const DiversionPage = ({
     } else if (snapshot.matches({ "Detour Drawing": "Active" })) {
       return (
         <ActiveDetourPanel
-          detourText="Hello World"
-          directions={extendedDirections}
+          copyableDetourText={copyableDetourText}
+          directions={
+            editedDirections
+              ? parseIntoDirectionsList(editedDirections)
+              : undefined
+          }
           connectionPoints={[
             connectionPoints?.start?.name ?? "N/A",
             connectionPoints?.end?.name ?? "N/A",
@@ -386,8 +385,12 @@ export const DiversionPage = ({
     } else if (snapshot.matches({ "Detour Drawing": "Past" })) {
       return (
         <PastDetourPanel
-          detourText="Hello World"
-          directions={extendedDirections}
+          copyableDetourText={copyableDetourText}
+          directions={
+            editedDirections
+              ? parseIntoDirectionsList(editedDirections)
+              : undefined
+          }
           connectionPoints={[
             connectionPoints?.start?.name ?? "N/A",
             connectionPoints?.end?.name ?? "N/A",

assets/src/models/createDetourMachine.ts

@@ -1,7 +1,7 @@
 import { setup, assign, fromPromise, ActorLogicFrom, InputFrom } from "xstate"
 import { RoutePatternId, ShapePoint } from "../schedule"
 import { Route, RouteId, RoutePattern } from "../schedule"
-import { Ok, Result } from "../util/result"
+import { isOk, Ok, Result } from "../util/result"
 import {
   FetchDetourDirectionsError,
   fetchDetourDirections,
@@ -30,6 +30,8 @@ export const createDetourMachine = setup({
 
       finishedDetour: FinishedDetour | undefined | null
 
+      editedDirections?: string
+
       selectedDuration?: string
       selectedReason?: string
     },
@@ -66,6 +68,7 @@ export const createDetourMachine = setup({
       | { type: "detour.edit.place-waypoint-on-route"; location: ShapePoint }
       | { type: "detour.edit.place-waypoint"; location: ShapePoint }
       | { type: "detour.edit.undo" }
+      | { type: "detour.share.edit-directions"; detourText: string }
       | { type: "detour.share.copy-detour"; detourText: string }
       | { type: "detour.share.open-activate-modal" }
       | {
@@ -472,6 +475,19 @@ export const createDetourMachine = setup({
 
           onDone: {
             target: "Share Detour",
+            actions: assign({
+              editedDirections: ({ context }) => {
+                const detourShape =
+                  context.detourShape && isOk(context.detourShape)
+                    ? context.detourShape.ok
+                    : null
+
+                return [
+                  "From " + context.nearestIntersection,
+                  ...(detourShape?.directions?.map((v) => v.instruction) ?? []),
+                ].join("\n")
+              },
+            }),
           },
         },
         "Share Detour": {
@@ -490,6 +506,12 @@ export const createDetourMachine = setup({
                 "detour.share.open-activate-modal": {
                   target: "Activating",
                 },
+                "detour.share.edit-directions": {
+                  target: "Reviewing",
+                  actions: assign({
+                    editedDirections: ({ event }) => event.detourText,
+                  }),
+                },
               },
             },
             Activating: {