@financial-times/n-myft-ui 23.1.2 → 24.0.2

package/demos/templates/demo.jsx

@@ -0,0 +1,33 @@
+import React from 'react';
+import FollowButton from '../../components/follow-button/follow-button';
+
+export default function Demo (props) {
+
+	const {
+		title,
+		flags,
+		followButton,
+	} = props;
+
+	const followButtonProps = {...followButton, flags};
+
+	return (
+		<div className="o-grid-container o-grid-container--snappy demo-container">
+			<h1>{title}</h1>
+
+			<section
+				id="follow-button"
+				className="demo-section">
+				<div className="o-grid-row">
+					<div data-o-grid-colspan="12">
+						<h2
+							className="demo-section__title">
+							Follow button
+						</h2>
+						<FollowButton {...followButtonProps} />
+					</div>
+				</div>
+			</section>
+		</div>
+	)
+}

package/jest.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+	transform: {
+		'.(js|jsx)': '@sucrase/jest-plugin',
+	},
+	testEnvironment: 'jest-environment-jsdom',
+	modulePathIgnorePatterns: ['node_modules', 'bower_components'],
+	testMatch: ['<rootDir>/components/**/*.test.js']
+};

package/mixins/lozenge/_themes.scss

@@ -4,28 +4,32 @@ $myft-lozenge-themes: (
 		text: oColorsByName('white'),
 		highlight: oColorsByName('claret-50'),
 		pressed-highlight: rgba(oColorsByName('black'), 0.05),
-		disabled: rgba(oColorsByName('black'), 0.5)
+		disabled: rgba(oColorsByName('black'), 0.5),
+		focus-outline: oColorsByUsecase('focus', 'outline', $fallback: null)
 	),
 	inverse: (
 		background: oColorsByName('white'),
 		text: oColorsByName('claret'),
 		highlight: rgba(white, 0.8),
 		pressed-highlight: rgba(white, 0.2),
-		disabled: rgba(oColorsByName('white'), 0.5)
+		disabled: rgba(oColorsByName('white'), 0.5),
+		focus-outline: oColorsByName('white')
 	),
 	opinion: (
 		background: oColorsByName('oxford-40'),
 		text: oColorsByName('white'),
 		highlight: oColorsByName('oxford-30'),
 		pressed-highlight: rgba(oColorsByName('oxford-40'), 0.2),
-		disabled: rgba(oColorsByName('black'), 0.5)
+		disabled: rgba(oColorsByName('black'), 0.5),
+		focus-outline: oColorsByUsecase('focus', 'outline', $fallback: null)
 	),
 	monochrome: (
 		background: oColorsByName('white'),
 		text: oColorsByName('black'),
 		highlight: oColorsByName('white-80'),
 		pressed-highlight: rgba(oColorsByName('white'), 0.2),
-		disabled: rgba(oColorsByName('white'), 0.5)
+		disabled: rgba(oColorsByName('white'), 0.5),
+		focus-outline: oColorsByName('white')
 	)
 );
 

package/mixins/lozenge/main.scss

@@ -1,6 +1,54 @@
 @import './themes';
 @import './toggle-icon';
 
+@mixin focusOutlineColor($focus-color) {
+	// Apply :focus styles as a fallback
+	// These styles will be applied to all browsers that don't use the polyfill, this includes browsers which support the feature natively.
+	body:not(.js-focus-visible) &,
+	html:not(.js-focus-visible) & {
+		// Standardise focus styles.
+		&:focus {
+			outline: 2px solid $focus-color;
+		}
+	}
+
+	// When the focus-visible polyfill is applied `.js-focus-visible` is added to the html dom node
+	// (the body node in v4 of the 3rd party polyfill)
+
+	// stylelint-disable-next-line selector-no-qualifying-type
+	body.js-focus-visible &, // stylelint-disable-next-line selector-no-qualifying-type
+	html.js-focus-visible & {
+		// Standardise focus styles.
+		// stylelint-disable-next-line selector-no-qualifying-type
+		&.focus-visible {
+			outline: 2px solid $focus-color;
+		}
+		// Disable browser default focus style.
+		// stylelint-disable-next-line selector-no-qualifying-type
+		&:focus:not(.focus-visible) {
+			outline: 0;
+		}
+	}
+
+	// These styles will be ignored by browsers which do not recognise the :focus-visible selector (as per the third bullet point in https://www.w3.org/TR/selectors-3/#Conformance)
+	// If a browser supports :focus-visible we unset the :focus styles that were applied above
+	// (within the html:not(.js-focus-visible) block).
+	&:focus-visible,
+	body:not(.js-focus-visible) &:focus,
+	html:not(.js-focus-visible) &:focus {
+		outline: unset;
+	}
+
+	// Styles given :focus-visible support. Extra selectors needed to match
+	// previous `:focus` selector specificity.
+	body:not(.js-focus-visible) &:focus-visible,
+	html:not(.js-focus-visible) &:focus-visible,
+	&:focus-visible {
+		outline: 2px solid $focus-color;
+	}
+}
+
+
 @mixin myftLozengeTheme($theme: standard, $with-toggle-icon: false) {
 	@if $with-toggle-icon != false {
 		@include myftToggleIcon($theme);
@@ -11,6 +59,8 @@
 		border: 1px solid getThemeColor(background);
 		color: getThemeColor(background);
 
+		@include focusOutlineColor(getThemeColor(focus-outline));
+
 		&:hover,
 		&:focus {
 			background-color: getThemeColor(pressed-highlight);
@@ -57,8 +107,4 @@
 	text-overflow: ellipsis;
 	transition: border-color, background-color 0.5s ease;
 	white-space: nowrap;
-
-	&:focus {
-		outline: 2px solid oColorsByName('teal-90');
-	}
 }

package/package.json

@@ -1,15 +1,13 @@
 {
   "name": "@financial-times/n-myft-ui",
-  "version": "23.1.2",
+  "version": "24.0.2",
   "description": "Client side component for interaction with myft",
   "main": "server.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "commit": "commit-wizard",
-    "precommit": "node_modules/.bin/secret-squirrel",
-    "prepush": "make verify -j3",
-    "commitmsg": "node_modules/.bin/secret-squirrel-commitmsg",
-    "prepare": "npx snyk protect || npx snyk protect -d || true"
+    "prepare": "npx snyk protect || npx snyk protect -d || true",
+    "preinstall": "npm_config_yes=true npx check-engine"
   },
   "repository": {
     "type": "git",
@@ -27,10 +25,13 @@
     "@financial-times/dotcom-build-js": "0.4.1",
     "@financial-times/dotcom-build-sass": "0.4.1",
     "@financial-times/dotcom-page-kit-cli": "0.4.1",
-    "@financial-times/n-gage": "^3.12.0",
-    "@financial-times/n-heroku-tools": "8.3.1",
-    "@financial-times/n-internal-tool": "2.3.4",
-    "@financial-times/x-handlebars": "1.0.0-beta.21",
+    "@financial-times/dotcom-server-handlebars": "^3.0.0",
+    "@financial-times/dotcom-server-react-jsx": "^2.6.2",
+    "@financial-times/n-express": "^22.4.1",
+    "@financial-times/n-gage": "^8.3.2",
+    "@sucrase/jest-plugin": "^2.2.0",
+    "@testing-library/jest-dom": "^5.16.1",
+    "@testing-library/react": "^12.1.2",
     "ascii-table": "0.0.9",
     "autoprefixer": "9.7.0",
     "aws-sdk-mock": "4.5.0",
@@ -50,9 +51,11 @@
     "brotli": "^1.3.1",
     "chai": "4.2.0",
     "chalk": "2.4.2",
+    "check-engine": "^1.10.1",
     "css-loader": "^0.23.1",
     "denodeify": "^1.2.1",
     "eslint": "6.5.1",
+    "eslint-plugin-react": "^7.27.1",
     "extract-css-block-webpack-plugin": "^1.3.0",
     "extract-text-webpack-plugin": "3.0.2",
     "fetch-mock": "^5.0.3",
@@ -62,6 +65,8 @@
     "hyperons": "^0.4.1",
     "imports-loader": "0.8.0",
     "inject-loader": "^3.0.0",
+    "jest": "^27.4.5",
+    "jsdom": "^19.0.0",
     "karma": "4.4.1",
     "karma-browserstack-launcher": "1.5.1",
     "karma-chai": "^0.1.0",
@@ -78,21 +83,37 @@
     "mocha": "6.2.2",
     "mockery": "2.1.0",
     "node-fetch": "2.6.0",
-    "node-sass": "4.13.0",
+    "node-sass": "^4.14.1",
     "nodemon": "^1.9.2",
     "npm-prepublish": "^1.2.1",
     "pa11y-ci": "^2.1.1",
     "postcss-loader": "^0.9.1",
+    "react": "^17.0.2",
     "regenerator-runtime": "^0.13.3",
-    "sass-loader": "^3.2.0",
     "semver": "6.3.0",
     "sinon": "^7.1.0",
     "sinon-chai": "^3.2.0",
-    "snyk": "^1.216.5"
+    "snyk": "^1.216.5",
+    "sucrase": "^3.10.1"
+  },
+  "volta": {
+    "node": "12.22.5",
+    "npm": "7.20.2"
+  },
+  "engines": {
+    "node": "12.x",
+    "npm": "7.x || 8.x"
   },
   "x-dash": {
     "engine": {
       "server": "hyperons"
     }
+  },
+  "husky": {
+    "hooks": {
+      "commit-msg": "node_modules/.bin/secret-squirrel-commitmsg",
+      "pre-commit": "node_modules/.bin/secret-squirrel",
+      "pre-push": "make verify -j3"
+    }
   }
 }

package/components/csrf-token/input.html

@@ -1,5 +0,0 @@
-<input
-	data-myft-csrf-token
-	value="{{#if @root.cacheablePersonalisedUrl}}{{@root.csrfToken}}{{/if}}"
-	type="hidden"
-	name="token">

package/components/follow-button/follow-button.html

@@ -1,79 +0,0 @@
-{{#if @root.flags.myFtApiWrite}}
-	<form
-		class="n-myft-ui n-myft-ui--follow {{extraClasses}}"
-		method="GET"
-		data-myft-ui="follow"
-		data-concept-id="{{conceptId}}"
-		{{#if collectionName}}data-myft-tracking="collectionName={{collectionName}}"{{/if}}
-		{{#if followPlusDigestEmail}}
-			action="/__myft/api/core/follow-plus-digest-email/{{conceptId}}?method=put"
-			data-myft-ui-variant="followPlusDigestEmail"
-		{{else}}
-			{{#ifAll setFollowButtonStateToSelected @root.cacheablePersonalisedUrl}}
-				action="/myft/remove/{{conceptId}}"
-				data-js-action="/__myft/api/core/followed/concept/{{conceptId}}?method=delete"
-			{{else}}
-				action="/myft/add/{{conceptId}}"
-				data-js-action="/__myft/api/core/followed/concept/{{conceptId}}?method=put"
-			{{/ifAll}}
-		{{/if}}>
-		{{> n-myft-ui/components/csrf-token/input}}
-		<div
-			class="n-myft-ui__announcement o-normalise-visually-hidden"
-			aria-live="assertive"
-			data-pressed-text="Now following {{name}}."
-			data-unpressed-text="No longer following {{name}}."
-		></div>
-		<button
-			{{#ifAll setFollowButtonStateToSelected @root.cacheablePersonalisedUrl}}
-				aria-label="Remove {{name}} from myFT"
-				title="Remove {{name}} from myFT"
-				data-alternate-label="Add {{name}} to myFT"
-				aria-pressed="true"
-				{{#if alternateText}}
-					data-alternate-text="{{alternateText}}"
-				{{else}}
-					{{#if buttonText}}
-						data-alternate-text="{{buttonText}}"
-					{{else}}
-						data-alternate-text="Add to myFT"
-					{{/if}}
-				{{/if}}
-			{{else}}
-				aria-pressed="false"
-				aria-label="Add {{name}} to myFT"
-				title="Add {{name}} to myFT"
-				data-alternate-label="Remove {{name}} from myFT"
-				{{#if alternateText}}
-					data-alternate-text="{{alternateText}}"
-				{{else}}
-					{{#if buttonText}}
-						data-alternate-text="{{buttonText}}"
-					{{else}}
-						data-alternate-text="Added"
-					{{/if}}
-				{{/if}}
-			{{/ifAll}}
-			class="{{extraButtonClasses}}
-				n-myft-follow-button
-				{{~#variant}} n-myft-follow-button--{{this}}{{/variant~}}"
-			data-concept-id="{{conceptId}}" {{! duplicated here for tracking}}
-			{{#if followPlusDigestEmail}}
-				data-trackable-context-messaging="add-to-myft-plus-digest-button"
-			{{/if}}
-			data-trackable="follow"
-			type="submit">
-			{{~#if buttonText~}}
-				{{buttonText}}
-			{{~else~}}
-				{{~#ifAll setFollowButtonStateToSelected @root.cacheablePersonalisedUrl~}}
-					Added
-				{{~else~}}
-					Add to myFT
-				{{~/ifAll~}}
-			{{~/if~}}
-		</button>
-	</form>
-{{else}}
-	<!-- Add to myFT button hidden due to myFtApiWrite being off -->
-{{/if}}

package/demos/fixtures/follow-button-plus-digest.json

@@ -1,6 +0,0 @@
-{
-  "conceptId": "00000000-0000-0000-0000-000000000044",
-  "name": "Keith inc.",
-  "directType": "http://www.ft.com/ontology/company/PublicCompany",
-  "followPlusDigestEmail": true
-}

package/demos/templates/digest-on-follow.html

@@ -1,12 +0,0 @@
-<div class="o-grid-container o-grid-container--snappy">
-<h1>{{title}}</h1>
-	<div class="o-grid-row">
-		<div data-o-grid-colspan="12">
-			<h2>Follow button</h2>
-
-			{{#followButton}}
-				{{> n-myft-ui/components/follow-button/follow-button}}
-			{{/followButton}}
-		</div>
-	</div>
-</div>