@royaloperahouse/chord 1.18.1-dev-chord-development → 1.18.2-a-chord-development

package/CHANGELOG.md

@@ -1,5 +1,8 @@
+## [1.18.1]
+- Fix iOS exception on VideoControls
+
 ## [1.18.0]
-- Add CompactHeading component
+- Add Compact PageHeading component
 
 ## [1.17.0]
 - Add Page Heading Panel variant

package/README.md

@@ -1,67 +1,277 @@
-# Royal Opera House - chord 
+# Royal Opera House Chord - Front End Design System
 
-Welcome to the Royal Opera House library components  `@royaloperahouse/chord`.
+Welcome to the Royal Opera House Front End Design System, `@royaloperahouse/chord`
 
 This package is a library of UI components intended to be used in the ROH website.
 
+It uses React, TypeScript, TSDX and Storybook.
 
-## Install
+The NPM packages are published at [https://www.npmjs.com/package/@royaloperahouse/chord](https://www.npmjs.com/package/@royaloperahouse/chord)
+
+The Storybook for the latest version of the library is hosted at [chord.roh.org.uk](chord.roh.org.uk)
+
+
+## Prerequisites
+---
+
+* Make sure the required package dependencies are installed using `yarn install`
+
+* If this is the first time you are working on Chord, make sure to run `yarn build` to build all the modules.
+
+* **To deploy the storybook publicly** you will need credentials for the **parent** 'Royal Opera House' AWS account in your `~/.aws/credentials` file.
+  * The deploy script expects these to be called `[parent]`.
+
+  * You can find these values at:
+  
+    *AWS 'Your Applications' page -> 'Royal Opera House' -> 'Developer Access' -> 'Command line or programmatic access'*
+
+* **To deploy a preview** for demo / QA you will need the `CHROMATIC_PROJECT_TOKEN` -- find this in 1Password
+
+
+* **To publish the NPM package** you will need the ROH `NPM_TOKEN` -- find this in 1Password
+
+
+## Versioning
+---
+
+We use [Semantic Versioning](https://semver.org/) for Chord.
+
+Given a version number MAJOR.MINOR.PATCH, increment the:
+
+* MAJOR version when you make incompatible library changes
+* MINOR version when you add functionality in a backwards compatible manner
+* PATCH version when you make backwards compatible bug fixes
+
+When you create a new release always update the `CHANGELOG` and `package.json`
+
+Increment your version from the latest stable version on `chord-releases`
+
+
+## Deploying the Storybook
+---
+
+### **1. To build and deploy locally**
+
+You can quickly build and serve the contents of `/storybook-static` from your local machine, for development and manual testing. To do this run:
+
+```bash
+yarn storybook
+```
+
+By default the storybook will be accessible at
+[http://localhost:6006/]()
+
+The server will hot-reload on most changes.
+
+### **2. To deploy a preview version remotely**
+
+You can deploy a release candidate, or work-in-progress to [Chromatic](https://www.chromatic.com/) for showcase or QA.
+
+**NOTE:** you will need the `CHROMATIC_PROJECT_TOKEN` as described in *Prerequisites* above.
+
+Either set the token as a shell variable or use a `.env` file in the chord root directory containing the token, as so:
+
+```
+CHROMATIC_PROJECT_TOKEN=tokengoeshere
+```
+
+Run:
+
+```
+yarn deploy-storybook-dev
+```
+
+to build and deploy the storybook from your repo to Chromatic.
+
+You will find the address of your deployed storybook in the console output, looking something like this:
+
+`→ View your Storybook at https://randomHexString-randomAlphabeticalString.chromatic.com`
+
+### **3. To deploy a release version**
+ 
+You can deploy the contents of `./storybook-static` to S3 as a static site, which is permanently accessible at [chord.roh.org.uk](chord.roh.org.uk)
+
+**NOTE:** To do this you will need the correct `AWS` credentials set up, as described in *Prerequisites* above.
+
+First build the storybook using:
+
+```
+yarn build-storybook
+```
+
+then run:
+
+```bash
+yarn deploy-storybook
+```
+
+> **IMPORTANT:** This URL is intended to showcase the latest stable version of Chord, it should be kept up to date with the main `chord-releases` branch and should **only** be used for release versions. If you want to deploy a development version follow the steps above under *To deploy a preview version remotely*.
+
+
+## Releasing a New Package Version
+---
+
+This is the procedure for releasing a new Chord NPM package.
+
+There are two types of package:
+
+A **snapshot** can be published to use a development version of the Chord library in our frontend staging environments, to perform integrated, manual testing.
+
+A **stable** package is published for use in production.
+
+**NOTE:** You will need the `NPM_TOKEN`, as described in 'Prerequisites' above.
+
+### **1. To release a snapshot version**
+
+> **IMPORTANT:** Make sure you always publish your **snapshots** from `chord-development` after merging in your feature branch.
+
+For snapshots, `RELEASE_VERSION` should be the same as the latest **stable** version of the Chord Library, as found in `chord-releases`, followed by an **unused** lowercase letter.
+
+For example, if the latest stable release was 1.42.0, and the last snapshot published to NPM was 1.42.0-w, you would use RELEASE_VERSION `1.42.0-x`
+
+To publish a snapshot use:
 
 ```bash
-    npm i --save @royaloperahouse/chord
+NPM_ROH_TOKEN={NPM_TOKEN} RELEASE_VERSION={RELEASE_VERSION} yarn publish-snapshot
 ```
+
+The version published to NPM will be named, e.g. `1.42.0-a-chord-development`, use this to install the snapshot package in the frontend repos.
+
+### **2. To release a stable version**
+
+> **IMPORTANT:** Make sure you always publish your **stable** packages from `chord-releases` after merging in your feature branch.
+
+For stable releases, increment your version from the latest **stable** version found on `chord-releases`, following the rules described in *Versioning* above, and use this as `RELEASE_VERSION`. (Make sure it matches the version in your `package.json` and `CHANGELOG.md`!)
+
+To publish a stable package use:
+
 ```bash
-    yarn add @royaloperahouse/chord
+NPM_ROH_TOKEN={NPM_TOKEN} RELEASE_VERSION={RELEASE_VERSION} yarn publish-release
 ```
 
-## Usage
 
-```javascript
-import {
-  Footer, GlobalStyles, ThemeProvider, ThemeType,
-} from '@royaloperahouse/chord';
+## Using the Package
+---
+
+The package is deployed to NPM, and can be installed using yarn or npm:
 
+```bash
+npm i --save @royaloperahouse/chord
 ```
-## Sample
+```bash
+yarn add @royaloperahouse/chord
+```
+
 
-```javascript
+## Testing
+---
 
-import {
-  Footer, GlobalStyles, ThemeProvider, ThemeType,
-} from '@royaloperahouse/chord';
+To **Lint** the package use:
 
+```bash
+yarn lint
+# Use the --fix option to perform automatic fixes
+```
 
-const App = ({ children }: InnerProps): React.ReactElement => (
-  <ErrorBoundary>
-    <ThemeProvider theme={ThemeType.Core}>
-      <GlobalStyles />
-      <Wrapper>
-        <Header />
-        <GlobalStyle />
-        <HealthBanner />
-        <ErrorBoundary>
-          <Content>
-            {children}
-          </Content>
-        </ErrorBoundary>
-        <LiveChat />
-      </Wrapper>
-      <Footer data={footerData} />
-    </ThemeProvider>
-  </ErrorBoundary>
-);
+To run the **unit tests** (using Jest) use:
 
+```bash
+yarn test
+
+# Use the -u option to update snapshots if needed
+# Run `yarn test:watch` to re-run tests on changes
 ```
 
-## Components
+To **run and and store the unit tests** for display in storybook use:
+
+```bash
+yarn test-storybook
+# Use the -u option to update snapshots if needed
+```
+
+
+## Development Process
+---
+
+### **1. Branching Model**
+* The Chord project lives in the `roh-components` *monorepo*
+* When working on Chord, treat the `roh-components/packages/chord` directory as your root
+* The Chord **development** branch is currently `chord-development`
+* The Chord **main** branch is currently `chord-releases`
+* All work should be done on a correctly named **feature branch** of the format: `issueType/ticketNumber-short-description-of-feature`, e.g. `feature/RD-1234-update-chord-documentation`
+* Always create your feature branch FROM, and submit pull requests TO, the **main** branch
+* For **QA / UAT** of a Chord component in isolation: following review you should deploy a preview version to Chromatic straight from your **feature branch** _without_ merging to development
+* For releasing an **NPM snapshot**: merge your feature branch into the **development** branch and publish the NPM snapshot from there
+
+### **2. Detailed Workflow**
+
+#### **Before review:**
+
+* Git pull the latest version of `chord-releases`
+* Checkout a new, correctly-named feature branch from `chord releases`
+* Do your work on this feature branch
+* Run: `yarn lint`
+* Run: `yarn test`
+* Commit your changes
+* Create a pull request from your feature branch to `chord-releases`
+* Add the appropriate reviewers
+
+#### **Before QA / UAT:**
+
+After your PR is approved, you have two options:
+
+**i.** For QA of a component in isolation:
 
-Accordion, Accordions, AltHeader, AnchorTabBar, AnnouncementBanner, BodyText, Card, Cards, Carousel, CinemaBadge, ContactCard, ControlledDropdown, devices, Editorial, Footer, GlobalStyles, Grid, GridItem, Header, HighlightsCarousel, HighlightsCarouselCinema, HighlightsCarouselCore, HighlightsCarouselStream, Icon, ImageWithCaption, Navigation, Overline, PageHeadingCinema, PageHeadingCore, PageHeadingImpact, PageHeadingStream, PeopleListing, PrimaryButton, PromoWithTags, PromoWithTitle, RotatorButtons, SecondaryButton, SecondaryLogo, SectionSplitter, SectionTitle, Sponsorship, StickyBar, StreamBadge, Subtitle, Tab, TabLink, Tabs, TertiaryButton, TextLink, TextOnly, Tickbox, TitleWithCTA, ThemeProvider, TypeTags, Quote
+* Follow the steps above in *Deploying the Storybook -> 2. Deploying a preview version remotely*
+* Share the generated Chromatic URL with the appropriate people for QA / UAT
+
+**ii.** For integrated testing of a component in the frontend staging environments:
+
+* Check out the `chord-development` branch
+* Merge your work in to `chord-development`
+* Follow the steps above under *Publishing a New Package Version -> 1. To release a snapshot version*
+* Git push the updated `chord-development` branch to remote
+* Finally, in the frontend repo:
+
+1. Update the `package.json` to reference the new snapshot version
+2. Run: `yarn install`
+3. Deploy the frontend to a staging environment
+
+#### **When ready for production:**
+
+* Return to your chord **feature branch**
+* Update the chord version in `package.json`, incrementing from the last **stable** release, found in `chord-releases`, and following the rules described in the *Versioning* section
+* Update `CHANGELOG.md`, adding the new version number and a short description of your changes
+* Run: `yarn lint`
+* Run: `yarn test`
+* Run: `yarn test-storybook -u`
+* Run: `yarn build-storybook`
+* Git commit, push, and update your PR for final approval
+* Merge your approved PR to `chord-releases`
+* Follow the steps in *Publishing a New Package Version -> 2. To release a stable version* to publish the NPM package
+* Finally, follow the steps in *Deploying The Storybook -> 3. To deploy a release version*, to update the public Chord Storybook page
+
+Once you have successfully published a new release version, you can open a ticket to update to this version in any of the frontend repos.
+
+
+## Notes
+---
+### The `storybook-static` folder
+
+This folder contains all the HTML / JS required to deploy the Storybook as a static site. It's autogenerated whenever the Storybook is built and therefore will show up a lot of merge conflicts when you merge other branches into your feature branch. It is best to leave generating the storybook until the later part of your workflow, but in case you run into conflicts earlier, it's ok to just delete the folder and regenerate using:
+
+```bash
+yarn build-storybook
+```
 
-## Types
+For the same reason changes to this folder will cause a lot of big diffs, when looking at a PR, but can mostly be skimmed over unless something looks unusual.
 
-AspectRatio, CarouselType, Colors, FooterData, INavigationProps, INavTopProps, TickboxMode, ThemeType
+---
+### Examples
 
+There is an example implementation in the example folder. Alternatively there are also integration examples in storybook. Make sure to keep these updated so as to showcase the current components available.
 
-## Documentation
+---
+### Bundle analysis
 
-See Storybook as a reference
+Calculate the real cost of your library using [size-limit](https://github.com/ai/size-limit) with `yarn size` and visualize it with `yarn analyze`.

package/dist/chord.cjs.development.js

@@ -3499,6 +3499,31 @@ var VolumeControlsWrapper = /*#__PURE__*/styled__default.div(_templateObject7$1
   return volumeHidden ? '40px' : '100px';
 }, trackStyles, trackStyles, trackStyles, trackStyles, trackStyles, thumbStyes, thumbStyes, thumbStyes);
 
+var isIOS = function isIOS() {
+  try {
+    console.warn('Do not use this on server side rendering, it may throw an error.');
+    if (typeof navigator === undefined) return false;
+    return ['iPad Simulator', 'iPhone Simulator', 'iPod Simulator', 'iPad', 'iPhone', 'iPod'].includes(navigator.platform) || // iPad on iOS 13 detection
+    navigator.userAgent.includes('Mac') && 'ontouchend' in document;
+  } catch (e) {
+    console.warn('Error checking if device is iOS.');
+    return false;
+  }
+}; // React hook version of isIOS
+
+
+var useIOS = function useIOS() {
+  var _useState = React.useState(false),
+      IOS = _useState[0],
+      setIOS = _useState[1];
+
+  React.useEffect(function () {
+    if (typeof navigator === undefined) return;
+    setIOS(isIOS());
+  }, []);
+  return IOS;
+};
+
 var VideoControls = function VideoControls(_ref) {
   var videoElementId = _ref.videoElementId,
       _ref$defaultMuted = _ref.defaultMuted,
@@ -3518,6 +3543,8 @@ var VideoControls = function VideoControls(_ref) {
       volume = _React$useState3[0],
       setVolume = _React$useState3[1];
 
+  var isIOS = useIOS();
+
   var getVideoElement = function getVideoElement() {
     return document.querySelector("#" + videoElementId);
   };
@@ -3573,7 +3600,9 @@ var VideoControls = function VideoControls(_ref) {
     "aria-label": !playing ? 'Play' : 'Pause'
   }, /*#__PURE__*/React__default.createElement(Icon, {
     iconName: !playing ? 'Play' : 'Pause'
-  })), /*#__PURE__*/React__default.createElement(VolumeControlsWrapper, null, /*#__PURE__*/React__default.createElement(VideoMute, {
+  })), /*#__PURE__*/React__default.createElement(VolumeControlsWrapper, {
+    volumeHidden: isIOS
+  }, /*#__PURE__*/React__default.createElement(VideoMute, {
     id: "mute",
     className: "video-mute-button",
     "data-testid": "video-mute-button",
@@ -3583,7 +3612,7 @@ var VideoControls = function VideoControls(_ref) {
     "data-testid": "mute-icon",
     iconName: muted ? 'Muted' : 'Volume',
     color: "white"
-  })), /*#__PURE__*/React__default.createElement(VideoVolume, {
+  })), !isIOS && /*#__PURE__*/React__default.createElement(VideoVolume, {
     id: "vol-control",
     type: "range",
     min: "0",
@@ -3680,24 +3709,6 @@ var SvgContainer = /*#__PURE__*/styled__default.div(_templateObject2$f || (_temp
 var NumContainer = /*#__PURE__*/styled__default.div(_templateObject3$9 || (_templateObject3$9 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: center;\n  width: 12px;\n  height: 12px;\n  position: absolute;\n  top: 8px;\n  margin-left: 6px;\n\n  & .basket-num {\n    color: white;\n    font-size: 10px;\n    font-family: var(--font-family-navigation);\n  }\n"])));
 var BasketText = /*#__PURE__*/styled__default.a(_templateObject4$5 || (_templateObject4$5 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  font-size: var(--font-size-navigation);\n  font-family: var(--font-family-navigation);\n  color: var(--base-color-black);\n  margin-left: 6px;\n  text-decoration: none;\n"])));
 
-var checkTimeRed = function checkTimeRed(seconds) {
-  if (seconds <= 0) {
-    return false;
-  }
-
-  return seconds / 60 <= 5;
-};
-var formatTime = function formatTime(seconds) {
-  if (seconds > 60) {
-    return Math.ceil(seconds / 60) + " mins";
-  }
-
-  return seconds + " sec" + (seconds === 1 ? '' : 's');
-};
-var initSeconds = function initSeconds(expiryDate) {
-  return expiryDate ? Math.ceil((new Date(expiryDate).getTime() - new Date().getTime()) / 1000) : 0;
-};
-
 var Basket$1 = function Basket(_ref) {
   var text = _ref.text,
       link = _ref.link,
@@ -3708,27 +3719,7 @@ var Basket$1 = function Basket(_ref) {
       onClick = _ref.onClick,
       _ref$colorPrimary = _ref.colorPrimary,
       colorPrimary = _ref$colorPrimary === void 0 ? 'primary' : _ref$colorPrimary,
-      expiryDate = _ref.expiryDate;
-
-  var _useState = React.useState(numItems),
-      basketItems = _useState[0],
-      setBasketItems = _useState[1];
-
-  var _useState2 = React.useState(initSeconds(expiryDate)),
-      seconds = _useState2[0],
-      setSeconds = _useState2[1];
-
-  var _useState3 = React.useState(formatTime(seconds)),
-      countdownText = _useState3[0],
-      setCountdownText = _useState3[1];
-
-  var _useState4 = React.useState(),
-      timer = _useState4[0],
-      setTimer = _useState4[1];
-
-  var _useState5 = React.useState(checkTimeRed(seconds)),
-      isActive = _useState5[0],
-      setIsActive = _useState5[1];
+      isActive = _ref.isActive;
 
   var onClickHandler = function onClickHandler() {
     if (onClick) {
@@ -3742,36 +3733,7 @@ var Basket$1 = function Basket(_ref) {
     }
   };
 
-  React.useEffect(function () {
-    if (timer) {
-      clearInterval(timer); // clears the old timer before setting a new one
-    }
-
-    if (!expiryDate || !numItems) return;
-    var interval = setInterval(function () {
-      setSeconds(function (prev) {
-        return prev - 1;
-      });
-    }, 1000);
-    setTimer(interval);
-    return function () {
-      return clearInterval(interval);
-    };
-  }, [expiryDate]);
-  React.useEffect(function () {
-    if (!timer) return;
-
-    if (seconds > 0) {
-      setCountdownText(formatTime(seconds));
-      setIsActive(checkTimeRed(seconds));
-    } else {
-      clearInterval(timer);
-      setBasketItems(0);
-      setCountdownText('');
-      setIsActive(false);
-    }
-  }, [seconds, timer]);
-  var empty = basketItems <= 0;
+  var empty = numItems <= 0;
   return /*#__PURE__*/React__default.createElement(BasketContainer, {
     selected: selected,
     onClick: onClickHandler,
@@ -3785,9 +3747,9 @@ var Basket$1 = function Basket(_ref) {
     iconName: "BasketFull"
   }), /*#__PURE__*/React__default.createElement(NumContainer, null, /*#__PURE__*/React__default.createElement("span", {
     className: "basket-num"
-  }, basketItems)))), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(BasketText, {
+  }, numItems)))), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(BasketText, {
     "data-testid": "baskettext"
-  }, expiryDate ? countdownText : text)));
+  }, text)));
 };
 
 var _templateObject$v, _templateObject2$g;
@@ -4053,6 +4015,7 @@ var NavTop = function NavTop(_ref) {
       basketText = _ref.basketText,
       basketLink = _ref.basketLink,
       basketNumItems = _ref.basketNumItems,
+      basketIsActive = _ref.basketIsActive,
       onClickSearch = _ref.onClickSearch,
       _ref$isShowSearch = _ref.isShowSearch,
       isShowSearch = _ref$isShowSearch === void 0 ? false : _ref$isShowSearch,
@@ -4066,6 +4029,7 @@ var NavTop = function NavTop(_ref) {
     link: basketLink,
     text: basketText,
     numItems: basketNumItems,
+    isActive: basketIsActive,
     onClick: onLink,
     colorPrimary: colorPrimary
   }), /*#__PURE__*/React__default.createElement(Account, {
@@ -4423,6 +4387,7 @@ var Navigation = function Navigation(_ref) {
     basketText: navTopData.basketText,
     basketLink: navTopData.basketLink,
     basketNumItems: navTopData.basketNumItems,
+    basketIsActive: navTopData.basketIsActive,
     onClickSearch: onClickSearchHandler,
     onLink: onLinkHandler,
     isShowSearch: showSearch,