Merge branch 'main' into UXPLATFORM-10196-NavigationSideMenu

cerner · Feb 20, 2024 · 0dd5b40 · 0dd5b40
2 parents bbd8f85 + 4aaab33
commit 0dd5b40
Show file tree

Hide file tree

Showing 205 changed files with 4,693 additions and 2,467 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,38 +1,38 @@
 {
   "name": "terra-framework",
-  "private": true,
   "version": "0.1.0",
   "description": "terra-framework",
-  "engines": {
-    "node": "10 || 12 || 14",
-    "npm": "9"
-  },
+  "author": "Cerner Corporation",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cerner/terra-framework.git"
   },
-  "workspaces": [
-    "packages/*"
-  ],
+  "bugs": {
+    "url": "https://github.com/cerner/terra-framework/issues"
+  },
+  "license": "Apache-2.0",
   "keywords": [
     "Cerner",
     "Terra",
     "Terra Framework",
     "terra-framework"
   ],
-  "author": "Cerner Corporation",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/cerner/terra-framework/issues"
+  "private": true,
+  "workspaces": [
+    "packages/*"
+  ],
+  "engines": {
+    "node": "10 || 12 || 14",
+    "npm": "9"
   },
   "browserslist": [
     "extends @cerner/browserslist-config-terra"
   ],
   "eslintConfig": {
     "extends": "@cerner/terra",
     "globals": {
-      "enzyme":"readonly",
-      "enzymeIntl":"readonly"
+      "enzyme": "readonly",
+      "enzymeIntl": "readonly"
     },
     "rules": {
       "react/forbid-prop-types": "off"
@@ -60,49 +60,6 @@
       }
     ]
   },
-  "scripts": {
-    "clean": "npm run clean:root && npm run clean:lib",
-    "clean:lib": "rm -rf packages/**/lib",
-    "clean:root": "$(lerna clean --yes || true) && echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
-    "clean:install": "npm run clean && time npm install",
-    "clean:containers": "echo 'stopping containers:' && docker stop $(docker ps -a -q) && echo 'removing containers:' && docker rm $(docker ps -a -q)",
-    "clean:obsolete-snapshots": "npm test -- -u",
-    "compile": "npm run clean:lib && npm run compile:build",
-    "compile:build": "lerna run compile",
-    "compile:src": "lerna run compile",
-    "compile:fusion": "rm -rf ./build; NODE_ENV=production THEME=orion-fusion-theme webpack --mode=production --config webpack.config.js",
-    "compile:lowlight": "rm -rf ./build; NODE_ENV=production THEME=clinical-lowlight-theme webpack --mode=production --config webpack.config.js",
-    "compile:default": "rm -rf ./build; NODE_ENV=production webpack --mode=production --config webpack.config.js",
-    "danger": "danger ci",
-    "deploy": "npm run compile:prod && gh-pages -d build",
-    "dependency-markdown": "node scripts/dependency-markdown-generator/DependencyMarkdownGenerator.js",
-    "docs": "node scripts/root-readme-updater/index.js",
-    "docs:peerDependencies": "node scripts/peer-dependency-generator/index.js",
-    "heroku-postbuild": "npm install --only=dev && npm run compile:prod",
-    "jest": "jest",
-    "jest:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "jest:no-coverage": "jest --no-coverage",
-    "lint": "npm run lint:js && npm run lint:scss:no-warnings && npm run lint:package-json",
-    "lint:js": "eslint --ext .js,.jsx . --max-warnings 0",
-    "lint:js:fix": "eslint --ext .js,.jsx . --fix",
-    "lint:package-json": "terra package-json-lint",
-    "lint:scss": "stylelint 'packages/**/src/**/*.scss'",
-    "lint:scss:no-warnings": "stylelint 'packages/**/src/**/*.scss' --quiet",
-    "prepare-for-release": "terra prepare-for-release",
-    "postinstall": "npm run compile",
-    "start": "webpack serve",
-    "start-heroku": "terra express-server --port $PORT --site build",
-    "start-prod": "webpack serve --env disableHotReloading --mode=production",
-    "start-static": "npm run compile:prod && terra express-server --site build",
-    "test": "npm run lint && npm run jest && npm run wdio",
-    "test:docker": "npm run lint && npm run jest && npm run wdio:docker",
-    "wdio": "terra wdio --themes terra-default-theme clinical-lowlight-theme orion-fusion-theme redwood-theme",
-    "wdio:default": "terra wdio",
-    "wdio:lowlight": "NODE_OPTIONS=--max-old-space-size=2048 terra wdio --themes clinical-lowlight-theme",
-    "wdio:fusion": "terra wdio --themes orion-fusion-theme",
-    "wdio:redwood": "terra wdio --themes redwood-theme",
-    "wdio:docker": "terra wdio --disableSeleniumService=true --themes terra-default-theme clinical-lowlight-theme orion-fusion-theme"
-  },
   "devDependencies": {
     "@babel/cli": "^7.5.0",
     "@babel/core": "^7.5.0",
@@ -155,5 +112,48 @@
     "webpack-dev-server": "^4.11.1",
     "webpack-merge": "^5.1.4",
     "xfc": "^1.12.0"
+  },
+  "scripts": {
+    "clean": "npm run clean:root && npm run clean:lib",
+    "clean:lib": "rm -rf packages/**/lib",
+    "clean:root": "$(lerna clean --yes || true) && echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
+    "clean:install": "npm run clean && time npm install",
+    "clean:containers": "echo 'stopping containers:' && docker stop $(docker ps -a -q) && echo 'removing containers:' && docker rm $(docker ps -a -q)",
+    "clean:obsolete-snapshots": "npm test -- -u",
+    "compile": "npm run clean:lib && npm run compile:build",
+    "compile:build": "lerna run compile",
+    "compile:src": "lerna run compile",
+    "compile:fusion": "rm -rf ./build; NODE_ENV=production THEME=orion-fusion-theme webpack --mode=production --config webpack.config.js",
+    "compile:lowlight": "rm -rf ./build; NODE_ENV=production THEME=clinical-lowlight-theme webpack --mode=production --config webpack.config.js",
+    "compile:default": "rm -rf ./build; NODE_ENV=production webpack --mode=production --config webpack.config.js",
+    "danger": "danger ci",
+    "deploy": "npm run compile:prod && gh-pages -d build",
+    "dependency-markdown": "node scripts/dependency-markdown-generator/DependencyMarkdownGenerator.js",
+    "docs": "node scripts/root-readme-updater/index.js",
+    "docs:peerDependencies": "node scripts/peer-dependency-generator/index.js",
+    "heroku-postbuild": "npm install --only=dev && npm run compile:prod",
+    "jest": "jest",
+    "jest:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
+    "jest:no-coverage": "jest --no-coverage",
+    "lint": "npm run lint:js && npm run lint:scss:no-warnings && npm run lint:package-json",
+    "lint:js": "eslint --ext .js,.jsx . --max-warnings 0",
+    "lint:js:fix": "eslint --ext .js,.jsx . --fix",
+    "lint:package-json": "terra package-json-lint",
+    "lint:scss": "stylelint 'packages/**/src/**/*.scss'",
+    "lint:scss:no-warnings": "stylelint 'packages/**/src/**/*.scss' --quiet",
+    "prepare-for-release": "terra prepare-for-release",
+    "postinstall": "npm run compile",
+    "start": "webpack serve",
+    "start-heroku": "terra express-server --port $PORT --site build",
+    "start-prod": "webpack serve --env disableHotReloading --mode=production",
+    "start-static": "npm run compile:prod && terra express-server --site build",
+    "test": "npm run lint && npm run jest && npm run wdio",
+    "test:docker": "npm run lint && npm run jest && npm run wdio:docker",
+    "wdio": "terra wdio --themes terra-default-theme clinical-lowlight-theme orion-fusion-theme redwood-theme",
+    "wdio:default": "terra wdio",
+    "wdio:lowlight": "NODE_OPTIONS=--max-old-space-size=2048 terra wdio --themes clinical-lowlight-theme",
+    "wdio:fusion": "terra wdio --themes orion-fusion-theme",
+    "wdio:redwood": "terra wdio --themes redwood-theme",
+    "wdio:docker": "terra wdio --disableSeleniumService=true --themes terra-default-theme clinical-lowlight-theme orion-fusion-theme"
   }
 }
diff --git a/packages/terra-abstract-modal/.npmignore b/packages/terra-abstract-modal/.npmignore
diff --git a/packages/terra-abstract-modal/CHANGELOG.md b/packages/terra-abstract-modal/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 3.46.0 - (February 16, 2024)
+
+* Added
+  * Added FocusOn to confine focus within the modal popup.
+
 ## 3.45.0 - (December 18, 2023)
 
 * Changed

diff --git a/packages/terra-abstract-modal/package.json b/packages/terra-abstract-modal/package.json
@@ -1,42 +1,52 @@
 {
   "name": "terra-abstract-modal",
-  "main": "lib/AbstractModal.js",
-  "version": "3.45.0",
+  "version": "3.46.0",
   "description": "The abstract modal is a structural component that provides the ability to display portal'd content in a layer above the app.",
+  "author": "Cerner Corporation",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cerner/terra-framework.git",
     "directory": "packages/terra-abstract-modal"
   },
+  "bugs": {
+    "url": "https://github.com/cerner/terra-framework/issues"
+  },
+  "homepage": "https://github.com/cerner/terra-framework#readme",
+  "license": "Apache-2.0",
   "keywords": [
+    "Abstract",
     "Cerner",
+    "Modal",
     "Terra",
     "terra-abstract-modal",
-    "Abstract",
-    "Modal",
     "UI"
   ],
-  "author": "Cerner Corporation",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/cerner/terra-framework/issues"
-  },
-  "homepage": "https://github.com/cerner/terra-framework#readme",
-  "peerDependencies": {
-    "react": "^16.8.5",
-    "react-dom": "^16.8.5",
-    "react-intl": ">=2.9.0, <6.0.0"
-  },
+  "main": "lib/AbstractModal.js",
+  "files": [
+    "lib",
+    "src",
+    "translations",
+    "CHANGELOG.md",
+    "LICENSE",
+    "NOTICE",
+    "README.md"
+  ],
   "dependencies": {
     "classnames": "^2.2.5",
     "keycode-js": "^3.1.0",
     "mutationobserver-shim": "<=0.3.3",
     "prop-types": "^15.5.8",
+    "react-focus-on": "^3.9.1",
     "react-portal": "^4.1.2",
     "terra-theme-context": "^1.9.0",
     "terra-visually-hidden-text": "^2.0.0",
     "wicg-inert": "^3.0.0"
   },
+  "peerDependencies": {
+    "react": "^16.8.5",
+    "react-dom": "^16.8.5",
+    "react-intl": "^2.8.0 || 3 || 4 || 5"
+  },
   "devDependencies": {
     "terra-icon": "^3.19.0"
   },

diff --git a/packages/terra-abstract-modal/src/AbstractModal.jsx b/packages/terra-abstract-modal/src/AbstractModal.jsx
@@ -78,6 +78,10 @@ const propTypes = {
    * If set to true, the AbstractModal is rendered inside a NotificationDialog.
    */
   isCalledFromNotificationDialog: PropTypes.bool,
+  /**
+   * If set to true, then the focus lock will get enabled.
+   */
+  shouldTrapFocus: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -90,6 +94,7 @@ const defaultProps = {
   rootSelector: '#root',
   zIndex: '6000',
   isCalledFromNotificationDialog: false,
+  shouldTrapFocus: false,
 };
 
 const AbstractModal = (props) => {
@@ -109,6 +114,7 @@ const AbstractModal = (props) => {
     onRequestClose,
     zIndex,
     isCalledFromNotificationDialog,
+    shouldTrapFocus,
     ...customProps
   } = props;
 
@@ -174,6 +180,7 @@ const AbstractModal = (props) => {
         ref={modalElementRef}
         onKeyDown={handleKeydown}
         isCalledFromNotificationDialog={isCalledFromNotificationDialog}
+        shouldTrapFocus={shouldTrapFocus}
       >
         {children}
       </ModalContent>