playbook_ui 12.28.0.pre.alpha.PLAY814removemomentjs871 → 12.28.0.pre.alpha.PLAY837MapCustomButton868

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bff4ae5eea63203df312bfe5084059ccbf7c03b00e21191e8febfdadef69e40
-  data.tar.gz: 4b2d45e698f7101b05145fe30247ceb58c007e91e9e8d239ce2ee81c9715bc99
+  metadata.gz: a11d84418c9c01374cd74d38a154f76d034ff440cd3a8580ffdace764232279e
+  data.tar.gz: fbf756271614a013e06861498022157b2a6c585f7402a6d14c2c1a34052745cd
 SHA512:
-  metadata.gz: '082571f8a9154aae27eea5c8087db5c24d1b9439cdbe8f699a5a9c8fdf72ea8d9ed8840595d4160500586ccbe73a6720ef3d221a464e971f825fff22b78abcc9'
-  data.tar.gz: 861ab41ccc20069e20fba759b72f8ea0d04cef37aa843ffa8ec4df6725b07a5a76ed10f90120dd3e90e1074cd86b53fa0c196a50a507b8aaa5f18885e79d6ea6
+  metadata.gz: 366d06de731005646685950b3bd763a791716076d22bb077265dee3ed18727fb7d6eefdc5063e1cb02b4246fee19cf8d692260294fd2c91c422cff8fec7dc0d6
+  data.tar.gz: ca19bd5db001368a141c1fa553313170d5fdc6ec1badb596160027f9c105cb97f7e117f9c3915b8cd039d7e8c0014dac4ba816a93e6f3cdbb90cbdb7860f6cd2

data/app/pb_kits/playbook/index.js

@@ -60,6 +60,7 @@ export { default as List } from './pb_list/_list'
 export { default as ListItem } from './pb_list/_list_item'
 export { default as LoadingInline } from './pb_loading_inline/_loading_inline'
 export { default as Map} from './pb_map/_map'
+export { default as MapCustomButton } from './pb_map/_map_custom_button'
 export { default as Message } from './pb_message/_message'
 export { default as MultiLevelSelect} from './pb_multi_level_select/_multi_level_select'
 export { default as MultipleUsers } from './pb_multiple_users/_multiple_users'

data/app/pb_kits/playbook/pb_date/_date.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 import classnames from "classnames";
 
+import DateTime from "../pb_kit/dateTime";
 import { buildAriaProps, buildCss, buildDataProps } from "../utilities/props";
 import { globalProps } from "../utilities/globalProps";
-import DateTime from '../pb_kit/dateTime';
 
 import Body from "../pb_body/_body";
 import Caption from "../pb_caption/_caption";
@@ -20,7 +20,7 @@ type PbDateProps = {
   showIcon?: boolean;
   size?: "sm" | "md" | "lg";
   unstyled?: boolean;
-  value: Date;
+  value: string | Date;
 };
 
 const PbDate = (props: PbDateProps) => {
@@ -37,11 +37,12 @@ const PbDate = (props: PbDateProps) => {
     value,
   } = props;
 
-  const weekday = DateTime.toWeekday(value);
-  const month = DateTime.toMonth(value);
-  const day = DateTime.toDay(value);
-  const year = DateTime.toYear(value);
-  const currentYear = new Date().getFullYear();
+  const dateTimestamp = new DateTime({ value: value });
+  const weekday = dateTimestamp.toWeekday();
+  const month = dateTimestamp.toMonth();
+  const day = dateTimestamp.toDay();
+  const year = dateTimestamp.toYear();
+  const currentYear = new Date().getFullYear().toString();
 
   const ariaProps = buildAriaProps(aria);
   const dataProps = buildDataProps(data);

data/app/pb_kits/playbook/pb_date_range_inline/_date_range_inline.tsx

@@ -3,7 +3,7 @@ import classnames from "classnames";
 
 import { globalProps } from "../utilities/globalProps";
 import { buildCss, buildDataProps } from "../utilities/props";
-import DateTime from '../pb_kit/dateTime';
+import DateTime from "../pb_kit/dateTime";
 
 import Body from "../pb_body/_body";
 import Caption from "../pb_caption/_caption";
@@ -21,16 +21,18 @@ type DateRangeInlineProps = {
   endDate?: Date;
 };
 
-const dateTimestamp = (dateValue: Date, includeYear: boolean) => {
+const dateTimestamp = (dateValue: Date | string, includeYear: boolean) => {
+  const date = new DateTime({ value: dateValue });
   if (includeYear) {
-    return `${DateTime.toMonth(dateValue)} ${DateTime.toDay(dateValue)}, ${DateTime.toYear(dateValue)}`;
+    return `${date.toMonth()} ${date.toDay()}, ${date.toYear()}`;
   } else {
-    return `${DateTime.toMonth(dateValue)} ${DateTime.toDay(dateValue)}`;
+    return `${date.toMonth()} ${date.toDay()}`;
   }
 };
 
-const dateTimeIso = (dateValue: Date) => {
-  return DateTime.toIso(dateValue);
+const dateTimeIso = (dateValue: Date | string) => {
+  const date = new DateTime({ value: dateValue });
+  return date.toIso();
 };
 
 const DateRangeInline = (props: DateRangeInlineProps) => {
@@ -50,17 +52,14 @@ const DateRangeInline = (props: DateRangeInlineProps) => {
       <>
         {icon && (
           <>
-            <Body color="light"
-                key={Math.random()}
-                tag="span"
-            >
+            <Body color="light" key={Math.random()} tag="span">
               <Icon
-                  className="pb_date_range_inline_icon"
-                  dark={dark}
-                  fixedWidth
-                  icon="calendar-alt"
-                  size={size}
-                  tag="span"
+                className="pb_date_range_inline_icon"
+                dark={dark}
+                fixedWidth
+                icon="calendar-alt"
+                size={size}
+                tag="span"
               />
             </Body>
           </>
@@ -79,7 +78,7 @@ const DateRangeInline = (props: DateRangeInlineProps) => {
 
   const dateRangeClasses = buildCss("pb_date_range_inline_kit", align);
   const dataProps = buildDataProps(data)
-  const renderTime = (date: Date) => {
+  const renderTime = (date: Date | string) => {
     return (
       <time dateTime={dateTimeIso(date)}>
         {dateInCurrentYear() ? (
@@ -93,30 +92,24 @@ const DateRangeInline = (props: DateRangeInlineProps) => {
 
   return (
     <div
-        {...dataProps}
-        className={classnames(dateRangeClasses, globalProps(props), className)}
+    {...dataProps}
+      className={classnames(dateRangeClasses, globalProps(props), className)}
     >
       <div className="pb_date_range_inline_wrapper">
         {size == "xs" && (
           <>
             {iconContent()}
-            <Caption dark={dark}
-                tag="span"
-            >
+            <Caption dark={dark} tag="span">
               {renderTime(startDate)}
             </Caption>
-            <Caption dark={dark}
-                tag="span"
-            >
+            <Caption dark={dark} tag="span">
               <Icon
-                  className="pb_date_range_inline_arrow"
-                  fixedWidth
-                  icon="long-arrow-right"
+                className="pb_date_range_inline_arrow"
+                fixedWidth
+                icon="long-arrow-right"
               />
             </Caption>
-            <Caption dark={dark}
-                tag="span"
-            >
+            <Caption dark={dark} tag="span">
               {renderTime(endDate)}
             </Caption>
           </>
@@ -125,25 +118,18 @@ const DateRangeInline = (props: DateRangeInlineProps) => {
         {size == "sm" && (
           <>
             {iconContent()}
-            <Body dark={dark}
-                tag="span"
-            >
+            <Body dark={dark} tag="span">
               {renderTime(startDate)}
             </Body>
-            <Body color="light"
-                dark={dark}
-                tag="span"
-            >
+            <Body color="light" dark={dark} tag="span">
               <Icon
-                  className="pb_date_range_inline_arrow"
-                  dark={dark}
-                  fixedWidth
-                  icon="long-arrow-right"
+                className="pb_date_range_inline_arrow"
+                dark={dark}
+                fixedWidth
+                icon="long-arrow-right"
               />
             </Body>
-            <Body dark={dark}
-                tag="span"
-            >
+            <Body dark={dark} tag="span">
               {renderTime(endDate)}
             </Body>
           </>

data/app/pb_kits/playbook/pb_date_range_stacked/_date_range_stacked.tsx

@@ -14,9 +14,9 @@ type DateRangeStackedProps = {
   className?: string | string[],
   data?: string,
   dark?: boolean,
-  endDate: Date,
+  endDate: string,
   id?: string,
-  startDate: Date,
+  startDate: string,
 }
 
 const DateRangeStacked = (props: DateRangeStackedProps) => {
@@ -29,9 +29,7 @@ const DateRangeStacked = (props: DateRangeStackedProps) => {
   const dataProps = buildDataProps(data)
 
   return (
-    <div {...dataProps}
-        className={css}
-    >
+    <div {...dataProps} className={css}>
       <Flex vertical="center">
         <FlexItem>
           <DateYearStacked

data/app/pb_kits/playbook/pb_date_stacked/_date_stacked.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 
 import classnames from "classnames";
+import DateTime from "../pb_kit/dateTime";
 import { buildCss, buildDataProps } from "../utilities/props";
 import { globalProps } from "../utilities/globalProps";
-import DateTime from '../pb_kit/dateTime';
 
 import Caption from "../pb_caption/_caption";
 import Title from "../pb_title/_title";
@@ -14,7 +14,7 @@ type DateStackedProps = {
   className?: string | string[];
   dark?: boolean;
   data?: string;
-  date: Date;
+  date: string | Date;
   size?: "sm" | "md";
   id?: string;
   reverse?: boolean;
@@ -45,42 +45,39 @@ const DateStacked = (props: DateStackedProps) => {
     className
   );
 
-  const currentYear = new Date().getFullYear()
-  const inputYear = DateTime.toYear(date);
+  const currentYear = new Date().getFullYear().toString();
+  const dateTimestamp = new DateTime({ value: date });
+  const inputYear = dateTimestamp.toYear().toString();
   const dataProps = buildDataProps(data)
 
   return (
     <>
       {bold == false ? (
-        <div {...dataProps}
-            className={classes}
-        >
+        <div {...dataProps} className={classes}>
           <div className="pb_date_stacked_day_month">
-            <Caption text={DateTime.toMonth(date).toUpperCase()} />
+            <Caption text={dateTimestamp.toMonth().toUpperCase()} />
             <Title
-                dark={dark}
-                size={sizes[size]}
-                text={DateTime.toDay(date).toString()}
+              dark={dark}
+              size={sizes[size]}
+              text={dateTimestamp.toDay()}
             />
           </div>
           {currentYear != inputYear && <Caption size="xs">{inputYear}</Caption>}
         </div>
       ) : (
-          <div {...dataProps}
-              className={classes}
-          >
+          <div {...dataProps} className={classes}>
             <div className="pb_date_stacked_day_month">
-              <Title
-                  bold
-                  dark={dark}
-                  size="4"
-                  text={DateTime.toMonth(date)}
+              <Title 
+                bold 
+                dark={dark} 
+                size="4" 
+                text={dateTimestamp.toMonth()} 
               />
-              <Title
-                  bold
-                  dark={dark}
-                  size="4"
-                  text={DateTime.toDay(date).toString()}
+              <Title 
+                bold 
+                dark={dark} 
+                size="4" 
+                text={dateTimestamp.toDay()} 
               />
               {currentYear != inputYear && <Title size="4">{inputYear}</Title>}
             </div>

data/app/pb_kits/playbook/pb_date_time/_date_time.tsx

@@ -13,7 +13,7 @@ type DateTimeProps = {
   aria?: { [key: string]: string; },
   className?: string,
   data?: { [key: string]: string; },
-  datetime: Date,
+  datetime: string,
   id?: string,
   size?: "sm" | "md",
   showDayOfWeek: boolean,

data/app/pb_kits/playbook/pb_date_time/dateTime.test.js

@@ -89,7 +89,7 @@ describe('DateTime Kit', () => {
     const kit = screen.getByTestId(testId)
     const text = kit.querySelector('.pb_time_kit_md.ml_sm')
 
-    expect(text.textContent).toEqual('2:00p GMT+9')
+    expect(text.textContent).toEqual('2:00p JST')
   })
   test('renders DatePicker size', () => {
     render(

data/app/pb_kits/playbook/pb_date_time_stacked/_date_time_stacked.tsx

@@ -12,8 +12,8 @@ import DateStacked from '../pb_date_stacked/_date_stacked'
 
 type DateTimeStackedProps = {
   id?: string,
-  date: Date,
-  datetime: Date,
+  date: string,
+  datetime: string,
   dark: boolean,
   timeZone?: string,
 }

data/app/pb_kits/playbook/pb_date_time_stacked/date_time_stacked.test.js

@@ -34,7 +34,7 @@ test('renders time in default timezone', () => {
 test('renders time in timezone', () => {
   props.timeZone = 'Asia/Tokyo'
   const kit = renderKit(DateTimeStacked, props)
-  expect(kit).toHaveTextContent(`${monthDayYear}2:00aGMT+9`)
+  expect(kit).toHaveTextContent(`${monthDayYear}2:00aJST`)
 })
 
 test('renders time in timezone', () => {

data/app/pb_kits/playbook/pb_date_year_stacked/_date_year_stacked.tsx

@@ -1,9 +1,9 @@
 import React from 'react'
 import classnames from 'classnames'
 
+import DateTime from '../pb_kit/dateTime'
 import { buildCss, buildDataProps } from '../utilities/props'
 import { globalProps } from '../utilities/globalProps'
-import DateTime from '../pb_kit/dateTime';
 
 import Body from '../pb_body/_body'
 import Title from '../pb_title/_title'
@@ -13,12 +13,13 @@ type DateYearStackedProps = {
   className?: string | string[],
   dark?: boolean,
   data?: string,
-  date: Date,
+  date: string,
   id?: string,
 }
 
 const DateYearStacked = (props: DateYearStackedProps) => {
   const { align = 'left', className, dark = false, date, data={} } = props
+  const dateTimestamp = new DateTime({ value: date })
   const css = classnames(
     buildCss('pb_date_year_stacked', align),
     globalProps(props),
@@ -28,14 +29,15 @@ const DateYearStacked = (props: DateYearStackedProps) => {
 
   return (
     <div {...dataProps}
-        className={css}
-    >
+    className={css}>
       <Title
           dark={dark}
           size={4}
-          text={`${DateTime.toDay(date)} ${DateTime.toMonth(date).toUpperCase()}`}
+          text={`${dateTimestamp.toDay()} ${dateTimestamp
+          .toMonth()
+          .toUpperCase()}`}
       />
-      <Body color="light">{DateTime.toYear(date)}</Body>
+      <Body color="light">{dateTimestamp.toYear()}</Body>
     </div>
   )
 }

data/app/pb_kits/playbook/pb_kit/dateTime.ts

@@ -1,162 +1,90 @@
+
+import moment, { Moment } from 'moment'
+import 'moment-strftime'
+import 'moment-timezone'
+
+type DateTimeType = {
+  value: string | Date,
+  zone?: string,
+}
+
 const ABBR_DAYS = ['SU', 'M', 'T', 'W', 'TH', 'F', 'S']
 
-const days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+export default class DateTime {
+  value: Moment & any
+  constructor({ value, zone = 'America/New_York' }: DateTimeType) {
+    this.value = this.convertToTimestampZone(value, zone)
+  }
 
-const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
+  convertToTimestampZone(value: string | Date, zone: string) {
+    return moment(value).tz(zone)
+  }
 
-export const toMinute = (newDate: Date, timeZone?: string): string => {
-  const date = new Date(newDate)
-  if (timeZone) {
-    return date.toLocaleTimeString(undefined, {timeZone, hour: "2-digit", minute: "2-digit"}).slice(3, 5);
-  } else {
-    return date.toLocaleTimeString(undefined, {hour: "2-digit", minute: "2-digit"}).slice(3, 5);
+  convertToTimezone() {
+    return this.value.strftime('%Z')
   }
-}
 
-export const toHour = (newDate: Date, timeZone?: string): string => {
-  const date = new Date(newDate)
-  if (timeZone) {
-    return date.toLocaleTimeString(undefined, {timeZone, hour: "numeric"}).split(' ')[0];
-  } else {
-    return date.toLocaleTimeString(undefined, {hour: "numeric"}).split(' ')[0];
+  toCustomFormat(format = '%-m/%-d') {
+    return this.value.strftime(format)
   }
-}
 
-export const toDay = (newDate: Date, timeZone?: string): number => {
-    if (timeZone) {
-      const date = new Date(newDate.toLocaleString(undefined, { timeZone }));
-      return date.getUTCDate()
-    } else {
-      const date = new Date(newDate)
-      return date.getUTCDate()
-    }
-}
+  toYear() {
+    return this.value.strftime('%Y')
+  }
 
-export const toDayAbbr = (newDate: Date): string => {
-  const date = new Date(newDate)
-  return ABBR_DAYS[date.getUTCDay()]
-}
+  toMonth() {
+    return this.value.strftime('%b')
+  }
 
-export const toWeekday = (newDate: Date): string => {
-    const date = new Date(newDate)
-    return days[date.getUTCDay()]
-}
+  toMonthNum() {
+    return this.value.strftime('%-m')
+  }
 
-export const toMonth = (newDate: Date, timeZone?: string): string => {
-    if (timeZone) {
-      const date = new Date(newDate.toLocaleString(undefined, { timeZone }));
-      return months[date.getUTCMonth()]
-    } else {
-      const date = new Date(newDate)
-      return months[date.getUTCMonth()]
-    }
-}
+  toMonthFull() {
+    return this.value.strftime('%B')
+  }
 
-export const toMonthNum = (newDate: Date): number => {
-  const date = new Date(newDate)
-  return date.getUTCMonth() +1
-}
+  toDay() {
+    return this.value.strftime('%e')
+  }
 
-export const toYear = (newDate: Date, timeZone?: string): number => {
-    if (timeZone) {
-      const date = new Date(newDate.toLocaleString(undefined, { timeZone }));
-      return date.getUTCFullYear()
-    } else {
-      const date = new Date(newDate)
-      return date.getUTCFullYear()
-    }
-}
+  toDayAbbr() {
+    return ABBR_DAYS[this.value.day()]
+  }
 
-export const toTime = (newDate: Date, timeZone?: string): string => {
-  const date = new Date(newDate)
-  if (timeZone) {
-    return date.toLocaleTimeString(undefined, {timeZone, timeStyle: "short"}).split(' ')[0];
-  } else {
-    return date.toLocaleTimeString(undefined, {timeStyle: "short"}).split(' ')[0];
+  toWeekday() {
+    return this.value.strftime('%a')
   }
-}
 
-export const toMeridiem = (newDate: Date, timeZone?: string): string => {
-    const date = new Date(newDate)
-    if (timeZone) {
-      return date.toLocaleString(undefined, {timeZone, hour12: true }).slice(-2).charAt(0).toLocaleLowerCase();
-    } else {
-      return date.toLocaleString(undefined, {hour12: true }).slice(-2).charAt(0).toLocaleLowerCase();
-    }
-}
+  toHour() {
+    return this.value.strftime('%l')
+  }
 
-export const toTimeZone = (newDate: Date, timeZone?: string): string => {
-    const date = new Date(newDate)
-    if (timeZone) {
-      return date.toLocaleString(undefined, {timeZone, timeZoneName: "short"}).split(' ')[3];
-    } else {
-      return date.toLocaleString(undefined, {timeZoneName: "short"}).split(' ')[3];
-    }
-}
+  toMinute() {
+    return this.value.strftime('%M')
+  }
 
-export const toTimeWithMeridiem = (newDate: Date, timeZone: string): string => {
-  const date = new Date(newDate)
-  return `${toTime(date, timeZone)}${toMeridiem(date, timeZone)}`;
-}
+  toMeridian() {
+    return this.value.strftime('%P')[0]
+  }
 
-export const toIso = (newDate: Date): string => {
-    const date = new Date(newDate)
-    return date.toISOString()
-}
+  toIso() {
+    return this.value.toISOString()
+  }
 
-export const fromNow = (newDate: Date): string => {
-
-  const startDate = new Date(newDate).getTime()
-  const endDate = new Date().getTime()
-  const elapsedTime = endDate - startDate
-  let elapsedTimeString = `${Math.round(elapsedTime / (365.25 * 24 * 60 * 60 * 1000))} years ago.`; // 730+ days
-
-  const elapsedTimeData = [
-    { min: 0, max: 44999, value: "a few seconds ago" }, // 0-44 seconds
-    { min: 45000, max: 89999, value: "a minute ago" }, // 45-89 seconds
-    { min: 90000, max: 2649999, value: `${Math.round(elapsedTime / 60000)} minutes ago`}, //  90s-44 minutes
-    { min: 2650000, max: 7299999, value: "an hour ago" }, // 45-120 minutes
-    { min: 7300000, max: 75699999, value: `${Math.round(elapsedTime / 3600000)} hours ago`}, // 2-21 hours
-    { min: 75700000, max: 172899999, value: "a day ago" }, // 22-48 hours
-    { min: 172900000, max: 2169999999, value: `${Math.round(elapsedTime / 86400000)} days ago`}, // 2-25 days
-    { min: 2170000000, max: 5184999999, value: "a month ago"}, // 26-60 days
-    { min: 5185000000, max: 27561699999, value: `${Math.round(elapsedTime / 30.44 * 24 * 60 * 60 * 1000)} months ago`}, // 60-319 days
-    { min: 27561700000, max: 63072999999, value: "a year ago"}, // 320-730 days
-  ];
-
-  for (const timeDate of elapsedTimeData) {
-    if (elapsedTime >= timeDate.min && elapsedTime <= timeDate.max) {
-      elapsedTimeString = timeDate.value;
-      break;
-    }
-  }
-
-  return elapsedTimeString
-}
+  toTime() {
+    const time = this.value.strftime('%I:%M')
 
-export const toCustomFormat = (newDate: Date, format = 'month_day'): string => {
-  const date = new Date(newDate)
-  if (format == "month_day") {
-    return `${toMonthNum(date)}/${toDay(date)}`
-  } else {
-    return `${date.toLocaleString(undefined, {month: "short"})} ${toDay(date)}`
+    // strftime adds a leading 0 on single hour times. ie 08:31.
+    // this removes that 0 to match the rails kit.
+    return time.charAt() === '0' ? time.slice(1) : time
   }
-}
 
-export default {
-  toMinute,
-  toHour,
-  toDay,
-  toDayAbbr,
-  toWeekday,
-  toMonth,
-  toMonthNum,
-  toYear,
-  toTime,
-  toMeridiem,
-  toTimeZone,
-  toTimeWithMeridiem,
-  toIso,
-  fromNow,
-  toCustomFormat,
-}
+  toTimezone() {
+    return this.value.strftime('%Z')
+  }
+
+  toTimeWithMeridian() {
+    return this.toTime() + this.toMeridian()
+  }
+}