Skip to content

Commit

Permalink
fix drupal asset fallback injections, update zod to pick up fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@sampsonj
sampsonj committed Dec 22, 2022
1 parent 322190a commit 735af47
Show file tree
Hide file tree
Showing 19 changed files with 368 additions and 193 deletions.
15 changes: 14 additions & 1 deletion lib/components/NeonFooter/NeonFooter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ exports.default = void 0;
var _react = _interopRequireDefault(require("react"));
var _propTypes = _interopRequireDefault(require("prop-types"));
var _htmlReactParser = _interopRequireDefault(require("html-react-parser"));
var _styles = require("@material-ui/core/styles");
var _Skeleton = _interopRequireDefault(require("@material-ui/lab/Skeleton"));
var _remoteAssetsMap = _interopRequireDefault(require("../../remoteAssetsMap/remoteAssetsMap"));
var _drupalFooter = _interopRequireDefault(require("../../remoteAssets/drupal-footer.html"));
var _NeonContext = _interopRequireWildcard(require("../NeonContext/NeonContext"));
var _Theme = _interopRequireDefault(require("../Theme/Theme"));
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
Expand All @@ -22,8 +24,18 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
var DRUPAL_FOOTER_HTML = _remoteAssetsMap.default.DRUPAL_FOOTER_HTML.KEY;
var useStyles = (0, _styles.makeStyles)(function (theme) {
return {
footerContainer: {
'& .footer-bottom__wrapper': {
background: '#4B372E'
}
}
};
});
var NeonFooter = function NeonFooter(props) {
var drupalCssLoaded = props.drupalCssLoaded;
var classes = useStyles(_Theme.default);
var _NeonContext$useNeonC = _NeonContext.default.useNeonContextState(),
_NeonContext$useNeonC2 = _slicedToArray(_NeonContext$useNeonC, 1),
_NeonContext$useNeonC3 = _NeonContext$useNeonC2[0],
Expand Down Expand Up @@ -60,7 +72,8 @@ var NeonFooter = function NeonFooter(props) {
case 'drupal-fallback':
default:
return /*#__PURE__*/_react.default.createElement("footer", {
id: "footer"
id: "footer",
className: classes.footerContainer
}, (0, _htmlReactParser.default)(_drupalFooter.default));
}
};
Expand Down
60 changes: 50 additions & 10 deletions lib/components/NeonHeader/NeonHeader.js
View file

Large diffs are not rendered by default.

34 changes: 25 additions & 9 deletions lib/components/NeonPage/NeonPage.js
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions lib/images/svg/header-search.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/remoteAssets/drupal-header.html.d.ts
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/remoteAssets/drupal-header.html.js
View file

Large diffs are not rendered by default.

88 changes: 58 additions & 30 deletions lib/remoteAssets/drupal-theme.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,11 +788,13 @@
#header input[type="password"]:not(.MuiInputBase-input),
#header input[type="date"]:not(.MuiInputBase-input),
#header input[type="email"]:not(.MuiInputBase-input),
#header input[type="number"]:not(.MuiInputBase-input), #footer input[type="text"]:not(.MuiInputBase-input),
#header input[type="number"]:not(.MuiInputBase-input),
#header input[type="time"]:not(.MuiInputBase-input), #footer input[type="text"]:not(.MuiInputBase-input),
#footer input[type="password"]:not(.MuiInputBase-input),
#footer input[type="date"]:not(.MuiInputBase-input),
#footer input[type="email"]:not(.MuiInputBase-input),
#footer input[type="number"]:not(.MuiInputBase-input) {
#footer input[type="number"]:not(.MuiInputBase-input),
#footer input[type="time"]:not(.MuiInputBase-input) {
height: 3rem;
background: #fff;
border: 1px solid #D7D9D9;
Expand All @@ -808,21 +810,25 @@
#header input[type="password"]:not(.MuiInputBase-input),
#header input[type="date"]:not(.MuiInputBase-input),
#header input[type="email"]:not(.MuiInputBase-input),
#header input[type="number"]:not(.MuiInputBase-input), #footer input[type="text"]:not(.MuiInputBase-input),
#header input[type="number"]:not(.MuiInputBase-input),
#header input[type="time"]:not(.MuiInputBase-input), #footer input[type="text"]:not(.MuiInputBase-input),
#footer input[type="password"]:not(.MuiInputBase-input),
#footer input[type="date"]:not(.MuiInputBase-input),
#footer input[type="email"]:not(.MuiInputBase-input),
#footer input[type="number"]:not(.MuiInputBase-input) {
#footer input[type="number"]:not(.MuiInputBase-input),
#footer input[type="time"]:not(.MuiInputBase-input) {
font-size: 1rem; } }
#header input[type="text"]:not(.MuiInputBase-input):hover,
#header input[type="password"]:not(.MuiInputBase-input):hover,
#header input[type="date"]:not(.MuiInputBase-input):hover,
#header input[type="email"]:not(.MuiInputBase-input):hover,
#header input[type="number"]:not(.MuiInputBase-input):hover, #footer input[type="text"]:not(.MuiInputBase-input):hover,
#header input[type="number"]:not(.MuiInputBase-input):hover,
#header input[type="time"]:not(.MuiInputBase-input):hover, #footer input[type="text"]:not(.MuiInputBase-input):hover,
#footer input[type="password"]:not(.MuiInputBase-input):hover,
#footer input[type="date"]:not(.MuiInputBase-input):hover,
#footer input[type="email"]:not(.MuiInputBase-input):hover,
#footer input[type="number"]:not(.MuiInputBase-input):hover {
#footer input[type="number"]:not(.MuiInputBase-input):hover,
#footer input[type="time"]:not(.MuiInputBase-input):hover {
box-shadow: none;
transition: all 0.25s;
border: 1px solid #0073CF !important; }
Expand All @@ -834,15 +840,19 @@
#header input[type="email"]:not(.MuiInputBase-input):active,
#header input[type="email"]:not(.MuiInputBase-input):focus,
#header input[type="number"]:not(.MuiInputBase-input):active,
#header input[type="number"]:not(.MuiInputBase-input):focus, #footer input[type="text"]:not(.MuiInputBase-input):active, #footer input[type="text"]:not(.MuiInputBase-input):focus,
#header input[type="number"]:not(.MuiInputBase-input):focus,
#header input[type="time"]:not(.MuiInputBase-input):active,
#header input[type="time"]:not(.MuiInputBase-input):focus, #footer input[type="text"]:not(.MuiInputBase-input):active, #footer input[type="text"]:not(.MuiInputBase-input):focus,
#footer input[type="password"]:not(.MuiInputBase-input):active,
#footer input[type="password"]:not(.MuiInputBase-input):focus,
#footer input[type="date"]:not(.MuiInputBase-input):active,
#footer input[type="date"]:not(.MuiInputBase-input):focus,
#footer input[type="email"]:not(.MuiInputBase-input):active,
#footer input[type="email"]:not(.MuiInputBase-input):focus,
#footer input[type="number"]:not(.MuiInputBase-input):active,
#footer input[type="number"]:not(.MuiInputBase-input):focus {
#footer input[type="number"]:not(.MuiInputBase-input):focus,
#footer input[type="time"]:not(.MuiInputBase-input):active,
#footer input[type="time"]:not(.MuiInputBase-input):focus {
transition: all 0.25s;
border: 1px solid #0073CF !important;
box-shadow: 0px 0px 0px 4px #C4C4C4;
Expand All @@ -851,16 +861,21 @@
#header input[type="password"]:not(.MuiInputBase-input):disabled,
#header input[type="date"]:not(.MuiInputBase-input):disabled,
#header input[type="email"]:not(.MuiInputBase-input):disabled,
#header input[type="number"]:not(.MuiInputBase-input):disabled, #footer input[type="text"]:not(.MuiInputBase-input):disabled,
#header input[type="number"]:not(.MuiInputBase-input):disabled,
#header input[type="time"]:not(.MuiInputBase-input):disabled, #footer input[type="text"]:not(.MuiInputBase-input):disabled,
#footer input[type="password"]:not(.MuiInputBase-input):disabled,
#footer input[type="date"]:not(.MuiInputBase-input):disabled,
#footer input[type="email"]:not(.MuiInputBase-input):disabled,
#footer input[type="number"]:not(.MuiInputBase-input):disabled {
#footer input[type="number"]:not(.MuiInputBase-input):disabled,
#footer input[type="time"]:not(.MuiInputBase-input):disabled {
color: #A2A4A3;
background: #F5F6F7;
border: 1px solid #D7D9D9;
box-sizing: border-box;
box-shadow: inset 0px 1px 0px #7C7F80; }
#header .time-start, #footer .time-start {
display: -ms-flexbox;
display: flex; }
#header textarea, #footer textarea {
background: #fff;
border: 1px solid #D7D9D9;
Expand Down Expand Up @@ -1376,24 +1391,23 @@
#header form:not(.layout-paragraphs-component-form) input[type="radio"]:not(.rlglc-input) + label:hover:before, #footer form:not(.layout-paragraphs-component-form) input[type="radio"]:not(.rlglc-input) + label:hover:before {
border: 1px solid #0073CF !important; }
#header .form-no-label .visually-hidden, #footer .form-no-label .visually-hidden {
clip: initial;
overflow: initial;
text-indent: -10000px;
height: auto;
width: auto; }
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked), #header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked), #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked {
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked), #header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked), #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked {
position: absolute;
left: -9999px; }
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label,
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label,
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label {
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label,
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label,
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label {
position: relative;
padding-left: 1.95em;
cursor: pointer;
z-index: 1; }
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:before,
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:before,
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:before {
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:before,
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:before,
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:before {
content: '';
position: absolute;
left: 0;
Expand All @@ -1403,9 +1417,9 @@
border: 1px solid #D7D9D9;
background: #fff;
border-radius: 2px; }
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:after,
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:after,
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:after {
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:after,
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:after,
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:after {
content: '';
background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2211%22%20height%3D%228%22%20viewBox%3D%220%200%2011%208%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%204l3%203%206-6%22%20stroke%3D%22%23000%22%20stroke-width%3D%222%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E");
background-position: center center;
Expand All @@ -1416,24 +1430,24 @@
width: 11px;
display: block;
position: absolute; }
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:after {
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:after {
opacity: 0;
transform: scale(0); }
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:after {
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:after {
opacity: 1;
transform: scale(1); }
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):disabled:not(:checked) + label:before,
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):disabled:checked + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):disabled:not(:checked) + label:before,
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):disabled:checked + label:before {
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):disabled:not(:checked) + label:before,
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):disabled:checked + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):disabled:not(:checked) + label:before,
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):disabled:checked + label:before {
box-shadow: none;
border-color: #D7D9D9;
background-color: #fff; }
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked:focus + label:before,
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked):focus + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked:focus + label:before,
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked):focus + label:before {
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked:focus + label:before,
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked):focus + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked:focus + label:before,
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked):focus + label:before {
box-shadow: 0px 0px 0px 4px #C4C4C4;
border: 1px solid #0073CF; }
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input) + label:hover:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input) + label:hover:before {
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday) + label:hover:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday) + label:hover:before {
border: 1px solid #0073CF !important; }
#header .webform-element-description, #footer .webform-element-description {
font-size: 0.875rem;
Expand All @@ -1443,6 +1457,20 @@
font-size: 0.9375rem; } }
#header #linkit-editor-dialog-form, #footer #linkit-editor-dialog-form {
min-height: 400px; }
#header .smartdate--time-inline, #footer .smartdate--time-inline {
display: -ms-flexbox;
display: flex;
grid-column-gap: 0.5em;
-ms-flex-direction: row;
flex-direction: row;
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
-ms-flex-line-pack: center;
align-content: center;
-ms-flex-align: baseline;
align-items: baseline;
-ms-flex-pack: start;
justify-content: flex-start; }
#header .table-wrapper, #footer .table-wrapper {
display: -ms-grid;
display: grid;
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"tinycolor2": "^1.4.2",
"ua-parser-js": "^1.0.32",
"universal-cookie": "^4.0.4",
"zod": "^3.20.0"
"zod": "^3.20.2"
},
"peerDependencies": {
"worker-loader": "^3.0.8"
Expand Down
Loading

0 comments on commit 735af47

Please sign in to comment.