From 1789a55a898df56c5d3b828171477d6b5463eabf Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 22 May 2024 12:22:21 -0400 Subject: [PATCH 1/9] feat(building-blocks): Create alert --- packages/building-blocks/package.json | 9 +- packages/building-blocks/src/Alert.tsx | 124 +++++++ .../src/stories/alerts.story.tsx | 76 ++++ yarn.lock | 332 +++++++++++++++++- 4 files changed, 537 insertions(+), 4 deletions(-) create mode 100644 packages/building-blocks/src/Alert.tsx create mode 100644 packages/building-blocks/src/stories/alerts.story.tsx diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json index 731a9a179..5617452ab 100644 --- a/packages/building-blocks/package.json +++ b/packages/building-blocks/package.json @@ -9,11 +9,13 @@ "module": "esm/index.js", "private": false, "devDependencies": { + "@opentripplanner/core-utils": "^11.2.3", "@opentripplanner/types": "^6.4.0", - "@opentripplanner/core-utils": "^11.2.3" + "styled-icons": "^10.34.0" }, "peerDependencies": { "react": "^16.14.0", + "react-animate-height": "^3.0.4", "styled-components": "^5.3.0" }, "repository": { @@ -27,5 +29,8 @@ "bugs": { "url": "https://github.com/opentripplanner/otp-ui/issues" }, - "gitHead": "0af1b7cda60bd4252b219dcf893e01c2acb2ed5d" + "gitHead": "0af1b7cda60bd4252b219dcf893e01c2acb2ed5d", + "dependencies": { + "styled-icons": "^10.47.1" + } } diff --git a/packages/building-blocks/src/Alert.tsx b/packages/building-blocks/src/Alert.tsx new file mode 100644 index 000000000..85d0d7cee --- /dev/null +++ b/packages/building-blocks/src/Alert.tsx @@ -0,0 +1,124 @@ +import React, { ReactChild, useState } from "react"; +import styled from "styled-components"; +import AnimateHeight from "react-animate-height"; +import { ChevronUp } from "@styled-icons/bootstrap/ChevronUp"; +import { Bell } from "@styled-icons/bootstrap/Bell"; +import blue from "./colors/blue"; + +interface Props { + alertHeader: string; + alertSubheader?: string; + backgroundColor?: string; + collapsable?: boolean; + children?: ReactChild; + Icon?: any; +} + +const AlertContainer = styled.div<{ + backgroundColor: string; + collapsable: boolean; + expandAlert: boolean; +}>` + background-color: ${props => + props.backgroundColor ? props.backgroundColor : blue[50]}; + display: grid; + grid-template-columns: 50px auto auto; + grid-template-rows: minmax(25px, auto) auto; + max-width: 715px; + padding: 1.5em 2em; + + svg { + align-self: center; + grid-column: 1; + grid-row: 1 / span 2; + justify-self: start; + } + + button { + background: transparent; + border: none; + width: 40px; + + svg { + transform: ${props => !props.expandAlert && "rotate(180deg)"}; + transition: all 0.2s ease-in; + } + } + + @media (max-width: 550px) { + grid-template-columns: 40px auto auto; + padding: 1.25em 1.25em; + } +`; + +const ButtonContainer = styled.span` + align-items: center; + display: flex; + justify-content: center; + justify-self: right; +`; + +const AlertHeader = styled.span` + align-self: center; + font-weight: 700; + grid-column: 2; +`; + +const AlertSubheader = styled(AlertHeader)` + font-weight: 400; + margin-top: 0.3em; +`; + +const AlertContent = styled.div` + grid-column: 2; + grid-row: 3; +`; + +const ContentPadding = styled.div<{ + collapsable: boolean; +}>` + margin-top: ${props => (props.collapsable ? "1em" : ".5em")}; +`; + +const Alert = ({ + alertHeader, + alertSubheader, + backgroundColor, + children, + collapsable, + Icon = Bell +}: Props): JSX.Element => { + const [expandAlert, setExpandAlert] = useState(false); + return ( + + + {alertHeader} + + {collapsable && ( + + )} + + {alertSubheader && {alertSubheader}} + {children && ( + + + + {children} + + + + )} + + ); +}; + +export default Alert; diff --git a/packages/building-blocks/src/stories/alerts.story.tsx b/packages/building-blocks/src/stories/alerts.story.tsx new file mode 100644 index 000000000..8602f1cd5 --- /dev/null +++ b/packages/building-blocks/src/stories/alerts.story.tsx @@ -0,0 +1,76 @@ +import React, { ReactElement } from "react"; +import { Meta } from "@storybook/react"; +import { Warning } from "@styled-icons/fluentui-system-regular/Warning"; +import Alert from "../Alert"; +import red from "../colors/red"; + +const meta: Meta = { + title: "Building-Blocks/Alert", + component: Alert +}; + +export default meta; + +const alerts = [ + { + alertUrl: "http://trimet.org/alerts/", + effectiveStartDate: 1576471800, + alertDescriptionText: + "TriMet Customer Service will be unavailable to serve text messages or Twitter responses from 9:00 p.m.- 11:30 p.m. For immediate assistance regarding safety or security concerns, please contact the police via 911." + }, + { + alertUrl: + "https://news.trimet.org/2019/11/next-up-for-elevator-improvements-sunset-transit-center-park-ride/", + effectiveStartDate: 1573083439, + alertDescriptionText: + "The Park and Ride garage elevator at Sunset Transit Center is closed for approximately 3 months for improvements. During this time garage users must use the stairs or find alternate parking. Visit trimet.org/parkandride for a complete list of Park and Ride garages." + }, + { + alertUrl: "http://trimet.org/alerts/", + effectiveStartDate: 1572827580, + alertDescriptionText: + "The west elevators at the Washington Park MAX Station are out of service. Please use east elevators to access street level and platforms. " + } +]; + +const AlertContent = () => { + return ( + <> + {alerts.map((alert, i) => { + return ( + <> +
+ {`${i + 1}) `} + {alert.alertDescriptionText} +
+
+ + ); + })} + + ); +}; + +export const BasicAlert = (): ReactElement => { + return ( + + Here is more content + + ); +}; + +export const CollapsableAlertWithTransitAlerts = (): ReactElement => { + return ( + + + + ); +}; diff --git a/yarn.lock b/yarn.lock index 886be9fff..69aa95de0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3246,6 +3246,11 @@ resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca" integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q== +"@opentripplanner/types@6.4.0": + version "6.4.0" + resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.4.0.tgz#6f7a3475ea982c7b7d8b2f1383a6d775dfabe62a" + integrity sha512-PS+CUwETLf0WzAUZg3qiey+SBigaf0CfknKF1XMOM+zJVc2c8nN34hgnwV7sS+RKs030KZFAgIn8p035ErcBuQ== + "@peculiar/asn1-schema@^2.1.6", "@peculiar/asn1-schema@^2.3.0": version "2.3.3" resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.3.tgz#21418e1f3819e0b353ceff0c2dad8ccb61acd777" @@ -4351,6 +4356,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/bootstrap@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/bootstrap/-/bootstrap-10.47.0.tgz#c3e363dfe87b732a5da818f320f90f5ab4961b84" + integrity sha512-xpnPdrLhAhpTRE4iljQIEK73twVj7VPglwHSL+8nQdH7EsW5RJIOWsmlkZMyqhQHN0H7fGmT10F3/6OQhSpfGg== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/boxicons-logos@10.38.0": version "10.38.0" resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-logos/-/boxicons-logos-10.38.0.tgz#f51442c49f1a28c61927d6d2f8c1e2d7946faf46" @@ -4359,6 +4372,14 @@ "@babel/runtime" "^7.15.3" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/boxicons-logos@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-logos/-/boxicons-logos-10.47.0.tgz#8a21a61d202e3ae2dfdec24d80897c3262777841" + integrity sha512-eDZfiTjBth4MsCX83ZfiWIoYGU494NxZgAxyf7S0ky2ZRsJnq/Cs7crH4hKWUTaLvCo0XRJmLeA3Us2tZFiItg== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/boxicons-regular@10.38.0", "@styled-icons/boxicons-regular@^10.38.0": version "10.38.0" resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-regular/-/boxicons-regular-10.38.0.tgz#1eb80b4f94a18a9b77b11dee5204aa23378d37ec" @@ -4367,6 +4388,14 @@ "@babel/runtime" "^7.15.3" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/boxicons-regular@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-regular/-/boxicons-regular-10.47.0.tgz#6318dd8ba9bfbf143c3a32c9d1c72479d376bd3a" + integrity sha512-z8KczDp4VArXvOn8i2j66Xs4oX9oiiJEhMoHydY3uC9kdtImcxhZ/xHPrgTJLkbK6f5ikwB4CKVnSqQGzzAJNw== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/boxicons-solid@10.38.0": version "10.38.0" resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-solid/-/boxicons-solid-10.38.0.tgz#bb2a6e21f3412c97ae8029396e3ca9fb107c7658" @@ -4375,6 +4404,14 @@ "@babel/runtime" "^7.15.3" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/boxicons-solid@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-solid/-/boxicons-solid-10.47.0.tgz#1b84245f3cbb8837e9ff2a6bd3563276e49d8e21" + integrity sha512-M795TXYtSJCpfr+ukHZfH9mA0j5MPlB5vwRCnU3O+dojAYla/zoaSashjhUbmlgzKNwALWNfzOqicSCAzU2fhg== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/crypto@10.38.0": version "10.38.0" resolved "https://registry.yarnpkg.com/@styled-icons/crypto/-/crypto-10.38.0.tgz#05920043cddd5042b04c91862c64e644f9bbf065" @@ -4383,6 +4420,14 @@ "@babel/runtime" "^7.15.3" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/crypto@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/crypto/-/crypto-10.47.0.tgz#056ff80eb342b6fa200736cb975b5d0988a3f47c" + integrity sha512-2hSOo1yb3ZEEOJAv9OBZLf3KQ8ujJrLw1uVDINJa7zLGuSfEWawnlkv/T2B0zQkOm0Hb6gikTRTAkLr4gyIS4Q== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/entypo-social@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/entypo-social/-/entypo-social-10.34.0.tgz#f2a719cd5811adb4b72b09b7614009a9c5d187e4" @@ -4391,6 +4436,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/entypo-social@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/entypo-social/-/entypo-social-10.46.0.tgz#6a6fc6aa102c03c43df0e87710eec8218c0ce42e" + integrity sha512-DWbUK7JkuAu4TPIBeeYfxys3cP8M4/q/XG2JVruDHa18viCEcDR1JXfn1p3TVYZCvlciKev+Vr1yrgcamTwVkg== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/entypo@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/entypo/-/entypo-10.34.0.tgz#469037689c6d55a1e58b0e3466ef64929a7155e3" @@ -4399,6 +4452,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/entypo@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/entypo/-/entypo-10.46.0.tgz#64f16e26fa9a559280cb990e1abe1fa38b5b370a" + integrity sha512-0ChIqx3EMlMeout4Aa5AwEYtKsgTqrY/NnVQGvhlGfMYq9mC7jq7JuaKvt5SJ9/0cEnVhgW5zwAe4LeyrsJl5g== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/evaicons-outline@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/evaicons-outline/-/evaicons-outline-10.34.0.tgz#a75c01763539a182834aefd6b60e9db0a45eef7b" @@ -4407,6 +4468,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/evaicons-outline@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/evaicons-outline/-/evaicons-outline-10.46.0.tgz#47f0af9926f9f99f998feeb723fd18c71f4b8161" + integrity sha512-+tHb/Ir6G1e+rSJ2YKgm2vzjF80JoXWEmoC48exFrQEKQkJPSWtsqKdROkfANKrY9AFnRKhJQ+9fHhnjS+V/OA== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/evaicons-solid@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/evaicons-solid/-/evaicons-solid-10.34.0.tgz#54cff976f32aad41949da7419f6d9947d7bde431" @@ -4415,6 +4484,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/evaicons-solid@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/evaicons-solid/-/evaicons-solid-10.46.0.tgz#37ca0af3d18f898bc1db081082f5893a24a39865" + integrity sha512-tRw2/TkmRNV4N2badKPFnnRy+WbVtUkrloNo94CgF5rpxoL0eK+ki3OYZYqbl0T66bJ07hqduqTc3rbxvT/vfw== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/evil@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/evil/-/evil-10.34.0.tgz#3b682dcec4dfdb1b58f4fd2458895adc03585f5b" @@ -4423,6 +4500,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/evil@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/evil/-/evil-10.46.0.tgz#882980fe2cb28ec2d844998920ba9776e022e539" + integrity sha512-r1g2jZmz84XGLgJbAPkMDmuToUF+KyNWkS6GNoP+ygzriNgzgoHkcEvIb/bx/I2/UUHeotRMOknvhvh5C2CwFg== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/fa-brands@10.38.0": version "10.38.0" resolved "https://registry.yarnpkg.com/@styled-icons/fa-brands/-/fa-brands-10.38.0.tgz#f4b6572c751409a62a3b5027e8d961e7dab7d33a" @@ -4431,6 +4516,14 @@ "@babel/runtime" "^7.15.3" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/fa-brands@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/fa-brands/-/fa-brands-10.47.0.tgz#f21190720a614319ef52d39afe0f2518ae0bbd16" + integrity sha512-w+G31+61nBnjxzCwMs+H9rNm9jl+HhtRgZYvNd+2NKQn1dRbHbBVXzQEHCOL6hksvkDbIa0iPrenqMU6pB+wZQ== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/fa-regular@10.34.0", "@styled-icons/fa-regular@^10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/fa-regular/-/fa-regular-10.34.0.tgz#b6761412c0b2985eae60d20bff77e76cecd2deb8" @@ -4439,7 +4532,7 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/fa-regular@^10.37.0": +"@styled-icons/fa-regular@10.47.0", "@styled-icons/fa-regular@^10.37.0": version "10.47.0" resolved "https://registry.yarnpkg.com/@styled-icons/fa-regular/-/fa-regular-10.47.0.tgz#0c2e3196bec0706d2cb7fce5f7f49fdefc15e3b1" integrity sha512-UL/MwhwlJ5SbcioI+UBR8KocYt6i+20akKn1ZNj0Pjgm2kv2odEJSWWkHCxh8J7T7s0q/Wvs3CMsBTMrKdKDpQ== @@ -4455,7 +4548,7 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/fa-solid@^10.37.0": +"@styled-icons/fa-solid@10.47.0", "@styled-icons/fa-solid@^10.37.0": version "10.47.0" resolved "https://registry.yarnpkg.com/@styled-icons/fa-solid/-/fa-solid-10.47.0.tgz#011ffe890054f10957e247a798214c304e2f95c3" integrity sha512-8AJjbOAkvPlB/ypFzWo++CZxRDlFQfvWQSjWzVU/v/4kjGRWIiVB+rJrTB7joDUd5Oas/se4cSiDkSA+XR/Fqg== @@ -4471,6 +4564,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/feather@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/feather/-/feather-10.47.0.tgz#20e1bbc38e12a99fbda3889a8d1d025b3a8ce76f" + integrity sha512-w6F3s1B4DaQGLr4AZZ0PffZQOnPSRqr3npHoTvk4Juz4uTjw9/oHolcrTxPyJas9gXAV1kCLbeiaxTR6JVxJPw== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/fluentui-system-filled@10.35.0": version "10.35.0" resolved "https://registry.yarnpkg.com/@styled-icons/fluentui-system-filled/-/fluentui-system-filled-10.35.0.tgz#6d89c09af2c98153c826ca6d04a91e6c50f6a7fa" @@ -4479,6 +4580,14 @@ "@babel/runtime" "^7.14.6" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/fluentui-system-filled@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/fluentui-system-filled/-/fluentui-system-filled-10.47.0.tgz#82abb14956b867657722a2558d08ef9024879a2e" + integrity sha512-jAO8bs9SY/5Xu2vxg5sJmnD5YA966G2m2qU4ezlDbLDIXSaX/1qUBUivBFSWCDn4q5rslegzD1rhc9FncgPbSw== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/fluentui-system-regular@10.35.0": version "10.35.0" resolved "https://registry.yarnpkg.com/@styled-icons/fluentui-system-regular/-/fluentui-system-regular-10.35.0.tgz#41d9400ecb7d1c0b438186aa9864cd2320c53c1b" @@ -4487,6 +4596,14 @@ "@babel/runtime" "^7.14.6" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/fluentui-system-regular@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/fluentui-system-regular/-/fluentui-system-regular-10.47.0.tgz#f82d96d22748b994212e751e89924526131f4ea8" + integrity sha512-x1TmxKS6mpX+QJw8ismT3rNa6TPvKYftmQRy57LbdNE9L5FkyWldrumPboZGKWi/oNiBn6SBelPeqv8LPFXNHQ== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/foundation@10.34.0", "@styled-icons/foundation@^10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/foundation/-/foundation-10.34.0.tgz#7d2ffb882701ca415ea0296ef5464bbd5884a5fe" @@ -4495,6 +4612,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/foundation@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/foundation/-/foundation-10.46.0.tgz#f68eaad4b404a88b7aaf9ab04e07d70cf5abcda9" + integrity sha512-RZqNVxStjvboGg6+X1By9pE0j7FuzUkfgbu9SgOkSzMrHTvnTOu0JiQ7nNw+CY46rXhT8JTwRCgk2OLTk+anGA== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/heroicons-outline@10.36.0": version "10.36.0" resolved "https://registry.yarnpkg.com/@styled-icons/heroicons-outline/-/heroicons-outline-10.36.0.tgz#e98d6dbfb05dcd9a8e56a764dd5e2124651ddcc9" @@ -4503,6 +4628,14 @@ "@babel/runtime" "^7.14.6" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/heroicons-outline@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/heroicons-outline/-/heroicons-outline-10.47.0.tgz#6b413931003a640faf98b82bedaf864b1a479143" + integrity sha512-C7bcJ/YPVKACoQLSBDM9DkgmrO1HmqAaru9kqYK2V+GaGUW5raf6dyTLo7GUYt/CJ7p3qWxsBz3SX6djzdaODQ== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/heroicons-solid@10.36.0": version "10.36.0" resolved "https://registry.yarnpkg.com/@styled-icons/heroicons-solid/-/heroicons-solid-10.36.0.tgz#38c3399d000c8f39eba5da66f3ad47d24f5acc60" @@ -4511,6 +4644,14 @@ "@babel/runtime" "^7.14.6" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/heroicons-solid@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/heroicons-solid/-/heroicons-solid-10.47.0.tgz#4457463fe15c8bf8c357bf22dd16d3e579a5e163" + integrity sha512-j+tJx2NzLG2tc91IXJVwKNjsI/osxmak+wmLfnfBsB+49srpxMYjuLPMtl9ZY/xgbNsWO36O+/N5Zf5bkgiKcQ== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/icomoon@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/icomoon/-/icomoon-10.34.0.tgz#f8e9ed47e408dc8ad0e363f53007dff23b787027" @@ -4519,6 +4660,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/icomoon@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/icomoon/-/icomoon-10.46.0.tgz#961e2c4ca8659e5061ffe6fa1a57c104ce3478d0" + integrity sha512-3KcTTuswDrC03byyr9G9v5aWDTrhO6PbbN5O7CtU4/NXY4AaOkTQ8GUfvRjZ8yG/aEYRH4VYkWFpYu1CdsZxNg== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/ionicons-outline@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-outline/-/ionicons-outline-10.34.0.tgz#9c39d21433908c0517371a1142634b1e9650eb5d" @@ -4527,6 +4676,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/ionicons-outline@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-outline/-/ionicons-outline-10.46.0.tgz#829a5d47c08503524030c901013cb03c97b1d589" + integrity sha512-BEFEBGQDhPssEshbHyrsAXbEb7hNsrsHa0Zh0zLlfCIB3Vxc2GrQU9Qibto443ZRVw5qgF7iBdSwQHiwY8dQJw== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/ionicons-sharp@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-sharp/-/ionicons-sharp-10.34.0.tgz#bf12f834d50b97d41f424687e9cf8cd403df8e05" @@ -4535,6 +4692,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/ionicons-sharp@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-sharp/-/ionicons-sharp-10.46.0.tgz#78b99fcac82cbfb87379de1f1e41ee42139caeb6" + integrity sha512-ZMkS+zBe04odi/4llkKMZkNEz8K3whta7Chzk81vvCTtR7jMnGEyw+tMUZbARliOOyaELBeTbgeUwNRNTibiSA== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/ionicons-solid@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-solid/-/ionicons-solid-10.34.0.tgz#348f135f010f8cc6d49649116e2cbf7ee992ed35" @@ -4543,6 +4708,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/ionicons-solid@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-solid/-/ionicons-solid-10.46.0.tgz#57909df67c7cdb710623fc9a58c20732f3520f81" + integrity sha512-agiuzQzqrrRWHrGfswC6EciKVjt/XSZuQFbvP/s6qU2oYkQuJRdhmAZQldTaj9Xb2GyAmEjM0cmkWG3+JzV7CQ== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/material-outlined@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/material-outlined/-/material-outlined-10.34.0.tgz#5da422bc14dbc0ad0b4e7e15153056866f42f37b" @@ -4551,6 +4724,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/material-outlined@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/material-outlined/-/material-outlined-10.47.0.tgz#d799a14c1cbbd4d730d046d9f791f108e907fd34" + integrity sha512-/QeDSGXlfRoIsgx4g4Hb//xhsucD4mJJsNPk/e1XzckxkNG+YHCIjbAHzDwxwNfSCJYcTDcOp2SZcoS7iyNGlw== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/material-rounded@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/material-rounded/-/material-rounded-10.34.0.tgz#8a8a1c35215a9c035da51ae5e4797821e5d07a23" @@ -4559,6 +4740,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/material-rounded@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/material-rounded/-/material-rounded-10.47.0.tgz#c2a9e8277ba88949caffe08d42360d7aa45afaa8" + integrity sha512-+ByhDd1FJept3k8iBDxMWSzmIh29UrgZTIzh2pADWldGrsD/2JKdsC7knQghSj9uCevHNMKEeVaYBQMLoNUjvw== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/material-sharp@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/material-sharp/-/material-sharp-10.34.0.tgz#b1d95bab46e8f4a3fb35446b9d7e1f7bcc942cde" @@ -4567,6 +4756,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/material-sharp@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/material-sharp/-/material-sharp-10.47.0.tgz#d019acd9acf49e81b81a10d0ccf06356d301ab7f" + integrity sha512-U9bjvur/vawfiBhE75efNOF4WkSAygn26bQvHFJPc71ZCisvgJncnlSmR0rUgWnu7Cp/qg6faDH5CKDXBmGWCA== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/material-twotone@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/material-twotone/-/material-twotone-10.34.0.tgz#91983def41f87e17d18d6d3d1fbbc4e6abb56106" @@ -4575,6 +4772,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/material-twotone@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/material-twotone/-/material-twotone-10.47.0.tgz#0308c1b26cc42c77ed3f4f82150666192dfee262" + integrity sha512-c4Q1r0EJaDEI1/IsBWo0Mo8lZZvtA/3Or1ScUcmjwKBZxpR8960uGy4CReLzBPALC4L6aPiM1H168fz39fm4oQ== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/material@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/material/-/material-10.34.0.tgz#479bd36834d26e2b8e2ed06813a141a578ea6008" @@ -4583,6 +4788,14 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/material@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/material/-/material-10.47.0.tgz#23c19f9659cd135ea44550b88393621bb81f81b4" + integrity sha512-6fwoLPHg3P9O/iXSblQ67mchgURJvhU7mfba29ICfpg62zJ/loEalUgspm1GGtYVSPtkejshVWUtV99dXpcQfg== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/octicons@10.44.0": version "10.44.0" resolved "https://registry.yarnpkg.com/@styled-icons/octicons/-/octicons-10.44.0.tgz#d7b6366c74f1fa129914956f6fb83a084c0dee27" @@ -4591,6 +4804,14 @@ "@babel/runtime" "^7.15.4" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/octicons@10.47.0": + version "10.47.0" + resolved "https://registry.yarnpkg.com/@styled-icons/octicons/-/octicons-10.47.0.tgz#a062f275730c1bf70df0b19fe41e9f0db9c24f5d" + integrity sha512-JOqEbwbh23u/AdaINod8ZeVN5MEcOvkSeMTwGIPaPgz5PNuWRj/+1LpixmBeZjAr/WhB0pxZBBwA+e91BelQCA== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/open-iconic@10.18.0": version "10.18.0" resolved "https://registry.yarnpkg.com/@styled-icons/open-iconic/-/open-iconic-10.18.0.tgz#658bd6aee9232d0983c7aa8949713221c7d5bb87" @@ -4599,6 +4820,14 @@ "@babel/runtime" "^7.10.5" "@styled-icons/styled-icon" "^10.6.0" +"@styled-icons/open-iconic@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/open-iconic/-/open-iconic-10.46.0.tgz#ddaa4ead799eae861ee21abea9d2b1484e2b6089" + integrity sha512-v7wrHcUACQeSfJrLan/jXxgz7RSlJJXSc2u33UR82ewkOSBhaXp/zZxKF1tFCT2spvth0NBl6OkZUCw9ctgyrA== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/remix-editor@10.33.0": version "10.33.0" resolved "https://registry.yarnpkg.com/@styled-icons/remix-editor/-/remix-editor-10.33.0.tgz#ee348658f2d44cef409004a077f2280620b9307d" @@ -4607,6 +4836,14 @@ "@babel/runtime" "^7.13.10" "@styled-icons/styled-icon" "^10.6.0" +"@styled-icons/remix-editor@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/remix-editor/-/remix-editor-10.46.0.tgz#81c0d3f174ff5fb1900a019acbeb4fc1f68318a1" + integrity sha512-oOrt6wj5//4LrZkm40bXcsFpTgXbdOkixu6RHuE3O82+Hqtw1bYR/smm5MbLOJ+Kz62SEjDF3sxqFO23ITDeUQ== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/remix-fill@10.18.0": version "10.18.0" resolved "https://registry.yarnpkg.com/@styled-icons/remix-fill/-/remix-fill-10.18.0.tgz#7a7b007b6d3e97ff3b63fc07f7af1d365245b25a" @@ -4615,6 +4852,14 @@ "@babel/runtime" "^7.10.5" "@styled-icons/styled-icon" "^10.6.0" +"@styled-icons/remix-fill@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/remix-fill/-/remix-fill-10.46.0.tgz#4477b1927e99faec55747bd92102b85e979ac203" + integrity sha512-D2rWGJ9/7BR+3TMvmIoWGASMfyhWT4lTF+we8h9Pya5Ye+69cftvp817DMuaR/6czCugXTrB++HTQX0XJfoBFw== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/remix-line@10.18.0": version "10.18.0" resolved "https://registry.yarnpkg.com/@styled-icons/remix-line/-/remix-line-10.18.0.tgz#f6bd167883fb46a0103d60a8f4106823740e4b3e" @@ -4623,6 +4868,14 @@ "@babel/runtime" "^7.10.5" "@styled-icons/styled-icon" "^10.6.0" +"@styled-icons/remix-line@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/remix-line/-/remix-line-10.46.0.tgz#8c66a18f951895f3e082a60b5a6a4f43b3c7b998" + integrity sha512-TkbtXdgcuM7VpE/51k8+sxfReFjSQpAFVnjJi8/gxwcTzjdOG7Plkgsaixi2+hiLk/Coj/+67KbntBoSevROsw== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/simple-icons@10.45.0": version "10.45.0" resolved "https://registry.yarnpkg.com/@styled-icons/simple-icons/-/simple-icons-10.45.0.tgz#fc102e514e0b417cc8cd3b773cc33005a07852dc" @@ -4631,6 +4884,14 @@ "@babel/runtime" "^7.15.4" "@styled-icons/styled-icon" "^10.6.3" +"@styled-icons/simple-icons@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/simple-icons/-/simple-icons-10.46.0.tgz#fbb8f73686dbb40e482356a5fdc23e895e2b8468" + integrity sha512-zHkbGqAqFOwpqDjbhKTKsAXNxtBOXb7Ot2eKoDaDFckJGr2shAXRchclUS6wSixSPwQIPGAUcdO7Cq744Ollng== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/styled-icon@10.6.3", "@styled-icons/styled-icon@^10.6.0", "@styled-icons/styled-icon@^10.6.3": version "10.6.3" resolved "https://registry.yarnpkg.com/@styled-icons/styled-icon/-/styled-icon-10.6.3.tgz#eae0e5e18fd601ac47e821bb9c2e099810e86403" @@ -4639,6 +4900,13 @@ "@babel/runtime" "^7.10.5" "@emotion/is-prop-valid" "^0.8.7" +"@styled-icons/styled-icon@10.7.1": + version "10.7.1" + resolved "https://registry.yarnpkg.com/@styled-icons/styled-icon/-/styled-icon-10.7.1.tgz#da04b80751e126756f98a5485b3b0dd9b52c9aba" + integrity sha512-WLYaeMTMhMkSxE+v+of+r2ovIk0tceDGfv8iqWHRMxvbm+6zxngVcQ4ELx6Zt/LFxqckmmoAdvo6ehiiYj6I6A== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/styled-icon@^10.7.0": version "10.7.0" resolved "https://registry.yarnpkg.com/@styled-icons/styled-icon/-/styled-icon-10.7.0.tgz#d6960e719b8567c8d0d3a87c40fb6f5b4952a228" @@ -4654,6 +4922,14 @@ "@babel/runtime" "^7.10.5" "@styled-icons/styled-icon" "^10.6.0" +"@styled-icons/typicons@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/typicons/-/typicons-10.46.0.tgz#b72c381941fbe66d3a34dbf2979611d25579cb2e" + integrity sha512-yCJnVggGsbxOyuIPEmD+9IYRvB5w41hpJKdpI0ErasYG9Izt/lGqUaaDaxR39u9s28Q54Fq/v+Ni17dFCs8FOw== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@styled-icons/zondicons@10.18.0": version "10.18.0" resolved "https://registry.yarnpkg.com/@styled-icons/zondicons/-/zondicons-10.18.0.tgz#56fd377ffb8412495694e4b19cb72b5bbd38f744" @@ -4662,6 +4938,14 @@ "@babel/runtime" "^7.10.5" "@styled-icons/styled-icon" "^10.6.0" +"@styled-icons/zondicons@10.46.0": + version "10.46.0" + resolved "https://registry.yarnpkg.com/@styled-icons/zondicons/-/zondicons-10.46.0.tgz#bc0d11da7c6e7602d78218e1d55c40b61d061c02" + integrity sha512-DUlww6TeFsFjHD/1qd+DtMutm44r3ssOYtPiMJrOVolX1NqdW6XzrJ5dTbVCA2s7Ucd+Vp25cWfXnLcJBfas3w== + dependencies: + "@babel/runtime" "^7.19.0" + "@styled-icons/styled-icon" "^10.7.0" + "@tootallnate/once@1": version "1.1.2" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" @@ -17823,6 +18107,50 @@ styled-icons@^10.34.0: "@styled-icons/typicons" "10.18.0" "@styled-icons/zondicons" "10.18.0" +styled-icons@^10.47.1: + version "10.47.1" + resolved "https://registry.yarnpkg.com/styled-icons/-/styled-icons-10.47.1.tgz#74511ca779147f482eba7434b0e5ca1fa8c8f8a6" + integrity sha512-O6SguU8Z8Qk+rWJkiPmoLOxCQ3x8Emabue2r4NPqX+CK1uyaNahzFtKaGq/0d13RTWXqfVOBUSIJZaIlu4G/CA== + dependencies: + "@babel/runtime" "^7.20.7" + "@styled-icons/bootstrap" "10.47.0" + "@styled-icons/boxicons-logos" "10.47.0" + "@styled-icons/boxicons-regular" "10.47.0" + "@styled-icons/boxicons-solid" "10.47.0" + "@styled-icons/crypto" "10.47.0" + "@styled-icons/entypo" "10.46.0" + "@styled-icons/entypo-social" "10.46.0" + "@styled-icons/evaicons-outline" "10.46.0" + "@styled-icons/evaicons-solid" "10.46.0" + "@styled-icons/evil" "10.46.0" + "@styled-icons/fa-brands" "10.47.0" + "@styled-icons/fa-regular" "10.47.0" + "@styled-icons/fa-solid" "10.47.0" + "@styled-icons/feather" "10.47.0" + "@styled-icons/fluentui-system-filled" "10.47.0" + "@styled-icons/fluentui-system-regular" "10.47.0" + "@styled-icons/foundation" "10.46.0" + "@styled-icons/heroicons-outline" "10.47.0" + "@styled-icons/heroicons-solid" "10.47.0" + "@styled-icons/icomoon" "10.46.0" + "@styled-icons/ionicons-outline" "10.46.0" + "@styled-icons/ionicons-sharp" "10.46.0" + "@styled-icons/ionicons-solid" "10.46.0" + "@styled-icons/material" "10.47.0" + "@styled-icons/material-outlined" "10.47.0" + "@styled-icons/material-rounded" "10.47.0" + "@styled-icons/material-sharp" "10.47.0" + "@styled-icons/material-twotone" "10.47.0" + "@styled-icons/octicons" "10.47.0" + "@styled-icons/open-iconic" "10.46.0" + "@styled-icons/remix-editor" "10.46.0" + "@styled-icons/remix-fill" "10.46.0" + "@styled-icons/remix-line" "10.46.0" + "@styled-icons/simple-icons" "10.46.0" + "@styled-icons/styled-icon" "10.7.1" + "@styled-icons/typicons" "10.46.0" + "@styled-icons/zondicons" "10.46.0" + stylelint-config-prettier@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-5.3.0.tgz#a6da626c2edabb2c5207bcf63fe449c16f5a24ec" From 09e08e06cac10924fc1202afc41c12b686e0edd6 Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 22 May 2024 13:28:00 -0400 Subject: [PATCH 2/9] deduplicate package.json --- packages/building-blocks/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json index 5617452ab..93824b0e1 100644 --- a/packages/building-blocks/package.json +++ b/packages/building-blocks/package.json @@ -10,8 +10,7 @@ "private": false, "devDependencies": { "@opentripplanner/core-utils": "^11.2.3", - "@opentripplanner/types": "^6.4.0", - "styled-icons": "^10.34.0" + "@opentripplanner/types": "^6.4.0" }, "peerDependencies": { "react": "^16.14.0", From 03e8d43095817fbcecb6f60e9bcedeeeaeae05fd Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:24:53 -0500 Subject: [PATCH 3/9] fix: Collapsable to Collapsible i guess --- packages/building-blocks/src/Alert.tsx | 18 +++++++++--------- .../src/stories/alerts.story.tsx | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/building-blocks/src/Alert.tsx b/packages/building-blocks/src/Alert.tsx index 85d0d7cee..ffbaa1942 100644 --- a/packages/building-blocks/src/Alert.tsx +++ b/packages/building-blocks/src/Alert.tsx @@ -9,14 +9,14 @@ interface Props { alertHeader: string; alertSubheader?: string; backgroundColor?: string; - collapsable?: boolean; + collapsible?: boolean; children?: ReactChild; Icon?: any; } const AlertContainer = styled.div<{ backgroundColor: string; - collapsable: boolean; + collapsible: boolean; expandAlert: boolean; }>` background-color: ${props => @@ -75,9 +75,9 @@ const AlertContent = styled.div` `; const ContentPadding = styled.div<{ - collapsable: boolean; + collapsible: boolean; }>` - margin-top: ${props => (props.collapsable ? "1em" : ".5em")}; + margin-top: ${props => (props.collapsible ? "1em" : ".5em")}; `; const Alert = ({ @@ -85,7 +85,7 @@ const Alert = ({ alertSubheader, backgroundColor, children, - collapsable, + collapsible, Icon = Bell }: Props): JSX.Element => { const [expandAlert, setExpandAlert] = useState(false); @@ -93,12 +93,12 @@ const Alert = ({ {alertHeader} - {collapsable && ( + {collapsible && ( @@ -109,9 +109,9 @@ const Alert = ({ - + {children} diff --git a/packages/building-blocks/src/stories/alerts.story.tsx b/packages/building-blocks/src/stories/alerts.story.tsx index 8602f1cd5..9257e9709 100644 --- a/packages/building-blocks/src/stories/alerts.story.tsx +++ b/packages/building-blocks/src/stories/alerts.story.tsx @@ -62,11 +62,11 @@ export const BasicAlert = (): ReactElement => { ); }; -export const CollapsableAlertWithTransitAlerts = (): ReactElement => { +export const CollapsibleAlertWithTransitAlerts = (): ReactElement => { return ( From 4437959b6e24ea77d4bf1b9a0c61e46c62778419 Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:52:24 -0500 Subject: [PATCH 4/9] remove styledIcons library --- packages/building-blocks/package.json | 2 +- .../src/stories/alerts.story.tsx | 4 +- yarn.lock | 313 +----------------- 3 files changed, 6 insertions(+), 313 deletions(-) diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json index c98b93f5f..c33248d0a 100644 --- a/packages/building-blocks/package.json +++ b/packages/building-blocks/package.json @@ -30,6 +30,6 @@ }, "gitHead": "0af1b7cda60bd4252b219dcf893e01c2acb2ed5d", "dependencies": { - "styled-icons": "^10.47.1" + "@styled-icons/bootstrap": "^10.47.0" } } diff --git a/packages/building-blocks/src/stories/alerts.story.tsx b/packages/building-blocks/src/stories/alerts.story.tsx index 9257e9709..6b3aad746 100644 --- a/packages/building-blocks/src/stories/alerts.story.tsx +++ b/packages/building-blocks/src/stories/alerts.story.tsx @@ -1,6 +1,6 @@ import React, { ReactElement } from "react"; import { Meta } from "@storybook/react"; -import { Warning } from "@styled-icons/fluentui-system-regular/Warning"; +import { ExclamationTriangle } from "@styled-icons/bootstrap/ExclamationTriangle"; import Alert from "../Alert"; import red from "../colors/red"; @@ -67,7 +67,7 @@ export const CollapsibleAlertWithTransitAlerts = (): ReactElement => { diff --git a/yarn.lock b/yarn.lock index f30831ffa..0b5b615f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6168,7 +6168,7 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/bootstrap@10.47.0": +"@styled-icons/bootstrap@^10.47.0": version "10.47.0" resolved "https://registry.yarnpkg.com/@styled-icons/bootstrap/-/bootstrap-10.47.0.tgz#c3e363dfe87b732a5da818f320f90f5ab4961b84" integrity sha512-xpnPdrLhAhpTRE4iljQIEK73twVj7VPglwHSL+8nQdH7EsW5RJIOWsmlkZMyqhQHN0H7fGmT10F3/6OQhSpfGg== @@ -6184,14 +6184,6 @@ "@babel/runtime" "^7.15.3" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/boxicons-logos@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-logos/-/boxicons-logos-10.47.0.tgz#8a21a61d202e3ae2dfdec24d80897c3262777841" - integrity sha512-eDZfiTjBth4MsCX83ZfiWIoYGU494NxZgAxyf7S0ky2ZRsJnq/Cs7crH4hKWUTaLvCo0XRJmLeA3Us2tZFiItg== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/boxicons-regular@10.38.0", "@styled-icons/boxicons-regular@^10.38.0": version "10.38.0" resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-regular/-/boxicons-regular-10.38.0.tgz#1eb80b4f94a18a9b77b11dee5204aa23378d37ec" @@ -6200,14 +6192,6 @@ "@babel/runtime" "^7.15.3" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/boxicons-regular@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-regular/-/boxicons-regular-10.47.0.tgz#6318dd8ba9bfbf143c3a32c9d1c72479d376bd3a" - integrity sha512-z8KczDp4VArXvOn8i2j66Xs4oX9oiiJEhMoHydY3uC9kdtImcxhZ/xHPrgTJLkbK6f5ikwB4CKVnSqQGzzAJNw== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/boxicons-solid@10.38.0": version "10.38.0" resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-solid/-/boxicons-solid-10.38.0.tgz#bb2a6e21f3412c97ae8029396e3ca9fb107c7658" @@ -6216,14 +6200,6 @@ "@babel/runtime" "^7.15.3" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/boxicons-solid@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-solid/-/boxicons-solid-10.47.0.tgz#1b84245f3cbb8837e9ff2a6bd3563276e49d8e21" - integrity sha512-M795TXYtSJCpfr+ukHZfH9mA0j5MPlB5vwRCnU3O+dojAYla/zoaSashjhUbmlgzKNwALWNfzOqicSCAzU2fhg== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/crypto@10.38.0": version "10.38.0" resolved "https://registry.yarnpkg.com/@styled-icons/crypto/-/crypto-10.38.0.tgz#05920043cddd5042b04c91862c64e644f9bbf065" @@ -6232,14 +6208,6 @@ "@babel/runtime" "^7.15.3" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/crypto@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/crypto/-/crypto-10.47.0.tgz#056ff80eb342b6fa200736cb975b5d0988a3f47c" - integrity sha512-2hSOo1yb3ZEEOJAv9OBZLf3KQ8ujJrLw1uVDINJa7zLGuSfEWawnlkv/T2B0zQkOm0Hb6gikTRTAkLr4gyIS4Q== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/entypo-social@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/entypo-social/-/entypo-social-10.34.0.tgz#f2a719cd5811adb4b72b09b7614009a9c5d187e4" @@ -6248,14 +6216,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/entypo-social@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/entypo-social/-/entypo-social-10.46.0.tgz#6a6fc6aa102c03c43df0e87710eec8218c0ce42e" - integrity sha512-DWbUK7JkuAu4TPIBeeYfxys3cP8M4/q/XG2JVruDHa18viCEcDR1JXfn1p3TVYZCvlciKev+Vr1yrgcamTwVkg== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/entypo@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/entypo/-/entypo-10.34.0.tgz#469037689c6d55a1e58b0e3466ef64929a7155e3" @@ -6264,14 +6224,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/entypo@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/entypo/-/entypo-10.46.0.tgz#64f16e26fa9a559280cb990e1abe1fa38b5b370a" - integrity sha512-0ChIqx3EMlMeout4Aa5AwEYtKsgTqrY/NnVQGvhlGfMYq9mC7jq7JuaKvt5SJ9/0cEnVhgW5zwAe4LeyrsJl5g== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/evaicons-outline@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/evaicons-outline/-/evaicons-outline-10.34.0.tgz#a75c01763539a182834aefd6b60e9db0a45eef7b" @@ -6280,14 +6232,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/evaicons-outline@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/evaicons-outline/-/evaicons-outline-10.46.0.tgz#47f0af9926f9f99f998feeb723fd18c71f4b8161" - integrity sha512-+tHb/Ir6G1e+rSJ2YKgm2vzjF80JoXWEmoC48exFrQEKQkJPSWtsqKdROkfANKrY9AFnRKhJQ+9fHhnjS+V/OA== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/evaicons-solid@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/evaicons-solid/-/evaicons-solid-10.34.0.tgz#54cff976f32aad41949da7419f6d9947d7bde431" @@ -6296,14 +6240,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/evaicons-solid@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/evaicons-solid/-/evaicons-solid-10.46.0.tgz#37ca0af3d18f898bc1db081082f5893a24a39865" - integrity sha512-tRw2/TkmRNV4N2badKPFnnRy+WbVtUkrloNo94CgF5rpxoL0eK+ki3OYZYqbl0T66bJ07hqduqTc3rbxvT/vfw== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/evil@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/evil/-/evil-10.34.0.tgz#3b682dcec4dfdb1b58f4fd2458895adc03585f5b" @@ -6312,14 +6248,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/evil@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/evil/-/evil-10.46.0.tgz#882980fe2cb28ec2d844998920ba9776e022e539" - integrity sha512-r1g2jZmz84XGLgJbAPkMDmuToUF+KyNWkS6GNoP+ygzriNgzgoHkcEvIb/bx/I2/UUHeotRMOknvhvh5C2CwFg== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/fa-brands@10.38.0": version "10.38.0" resolved "https://registry.yarnpkg.com/@styled-icons/fa-brands/-/fa-brands-10.38.0.tgz#f4b6572c751409a62a3b5027e8d961e7dab7d33a" @@ -6328,14 +6256,6 @@ "@babel/runtime" "^7.15.3" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/fa-brands@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/fa-brands/-/fa-brands-10.47.0.tgz#f21190720a614319ef52d39afe0f2518ae0bbd16" - integrity sha512-w+G31+61nBnjxzCwMs+H9rNm9jl+HhtRgZYvNd+2NKQn1dRbHbBVXzQEHCOL6hksvkDbIa0iPrenqMU6pB+wZQ== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/fa-regular@10.34.0", "@styled-icons/fa-regular@^10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/fa-regular/-/fa-regular-10.34.0.tgz#b6761412c0b2985eae60d20bff77e76cecd2deb8" @@ -6344,7 +6264,7 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/fa-regular@10.47.0", "@styled-icons/fa-regular@^10.37.0": +"@styled-icons/fa-regular@^10.37.0": version "10.47.0" resolved "https://registry.yarnpkg.com/@styled-icons/fa-regular/-/fa-regular-10.47.0.tgz#0c2e3196bec0706d2cb7fce5f7f49fdefc15e3b1" integrity sha512-UL/MwhwlJ5SbcioI+UBR8KocYt6i+20akKn1ZNj0Pjgm2kv2odEJSWWkHCxh8J7T7s0q/Wvs3CMsBTMrKdKDpQ== @@ -6360,7 +6280,7 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/fa-solid@10.47.0", "@styled-icons/fa-solid@^10.37.0": +"@styled-icons/fa-solid@^10.37.0": version "10.47.0" resolved "https://registry.yarnpkg.com/@styled-icons/fa-solid/-/fa-solid-10.47.0.tgz#011ffe890054f10957e247a798214c304e2f95c3" integrity sha512-8AJjbOAkvPlB/ypFzWo++CZxRDlFQfvWQSjWzVU/v/4kjGRWIiVB+rJrTB7joDUd5Oas/se4cSiDkSA+XR/Fqg== @@ -6376,14 +6296,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/feather@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/feather/-/feather-10.47.0.tgz#20e1bbc38e12a99fbda3889a8d1d025b3a8ce76f" - integrity sha512-w6F3s1B4DaQGLr4AZZ0PffZQOnPSRqr3npHoTvk4Juz4uTjw9/oHolcrTxPyJas9gXAV1kCLbeiaxTR6JVxJPw== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/fluentui-system-filled@10.35.0": version "10.35.0" resolved "https://registry.yarnpkg.com/@styled-icons/fluentui-system-filled/-/fluentui-system-filled-10.35.0.tgz#6d89c09af2c98153c826ca6d04a91e6c50f6a7fa" @@ -6392,14 +6304,6 @@ "@babel/runtime" "^7.14.6" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/fluentui-system-filled@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/fluentui-system-filled/-/fluentui-system-filled-10.47.0.tgz#82abb14956b867657722a2558d08ef9024879a2e" - integrity sha512-jAO8bs9SY/5Xu2vxg5sJmnD5YA966G2m2qU4ezlDbLDIXSaX/1qUBUivBFSWCDn4q5rslegzD1rhc9FncgPbSw== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/fluentui-system-regular@10.35.0": version "10.35.0" resolved "https://registry.yarnpkg.com/@styled-icons/fluentui-system-regular/-/fluentui-system-regular-10.35.0.tgz#41d9400ecb7d1c0b438186aa9864cd2320c53c1b" @@ -6408,14 +6312,6 @@ "@babel/runtime" "^7.14.6" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/fluentui-system-regular@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/fluentui-system-regular/-/fluentui-system-regular-10.47.0.tgz#f82d96d22748b994212e751e89924526131f4ea8" - integrity sha512-x1TmxKS6mpX+QJw8ismT3rNa6TPvKYftmQRy57LbdNE9L5FkyWldrumPboZGKWi/oNiBn6SBelPeqv8LPFXNHQ== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/foundation@10.34.0", "@styled-icons/foundation@^10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/foundation/-/foundation-10.34.0.tgz#7d2ffb882701ca415ea0296ef5464bbd5884a5fe" @@ -6424,14 +6320,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/foundation@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/foundation/-/foundation-10.46.0.tgz#f68eaad4b404a88b7aaf9ab04e07d70cf5abcda9" - integrity sha512-RZqNVxStjvboGg6+X1By9pE0j7FuzUkfgbu9SgOkSzMrHTvnTOu0JiQ7nNw+CY46rXhT8JTwRCgk2OLTk+anGA== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/heroicons-outline@10.36.0": version "10.36.0" resolved "https://registry.yarnpkg.com/@styled-icons/heroicons-outline/-/heroicons-outline-10.36.0.tgz#e98d6dbfb05dcd9a8e56a764dd5e2124651ddcc9" @@ -6440,14 +6328,6 @@ "@babel/runtime" "^7.14.6" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/heroicons-outline@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/heroicons-outline/-/heroicons-outline-10.47.0.tgz#6b413931003a640faf98b82bedaf864b1a479143" - integrity sha512-C7bcJ/YPVKACoQLSBDM9DkgmrO1HmqAaru9kqYK2V+GaGUW5raf6dyTLo7GUYt/CJ7p3qWxsBz3SX6djzdaODQ== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/heroicons-solid@10.36.0": version "10.36.0" resolved "https://registry.yarnpkg.com/@styled-icons/heroicons-solid/-/heroicons-solid-10.36.0.tgz#38c3399d000c8f39eba5da66f3ad47d24f5acc60" @@ -6456,14 +6336,6 @@ "@babel/runtime" "^7.14.6" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/heroicons-solid@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/heroicons-solid/-/heroicons-solid-10.47.0.tgz#4457463fe15c8bf8c357bf22dd16d3e579a5e163" - integrity sha512-j+tJx2NzLG2tc91IXJVwKNjsI/osxmak+wmLfnfBsB+49srpxMYjuLPMtl9ZY/xgbNsWO36O+/N5Zf5bkgiKcQ== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/icomoon@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/icomoon/-/icomoon-10.34.0.tgz#f8e9ed47e408dc8ad0e363f53007dff23b787027" @@ -6472,14 +6344,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/icomoon@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/icomoon/-/icomoon-10.46.0.tgz#961e2c4ca8659e5061ffe6fa1a57c104ce3478d0" - integrity sha512-3KcTTuswDrC03byyr9G9v5aWDTrhO6PbbN5O7CtU4/NXY4AaOkTQ8GUfvRjZ8yG/aEYRH4VYkWFpYu1CdsZxNg== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/ionicons-outline@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-outline/-/ionicons-outline-10.34.0.tgz#9c39d21433908c0517371a1142634b1e9650eb5d" @@ -6488,14 +6352,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/ionicons-outline@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-outline/-/ionicons-outline-10.46.0.tgz#829a5d47c08503524030c901013cb03c97b1d589" - integrity sha512-BEFEBGQDhPssEshbHyrsAXbEb7hNsrsHa0Zh0zLlfCIB3Vxc2GrQU9Qibto443ZRVw5qgF7iBdSwQHiwY8dQJw== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/ionicons-sharp@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-sharp/-/ionicons-sharp-10.34.0.tgz#bf12f834d50b97d41f424687e9cf8cd403df8e05" @@ -6504,14 +6360,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/ionicons-sharp@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-sharp/-/ionicons-sharp-10.46.0.tgz#78b99fcac82cbfb87379de1f1e41ee42139caeb6" - integrity sha512-ZMkS+zBe04odi/4llkKMZkNEz8K3whta7Chzk81vvCTtR7jMnGEyw+tMUZbARliOOyaELBeTbgeUwNRNTibiSA== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/ionicons-solid@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-solid/-/ionicons-solid-10.34.0.tgz#348f135f010f8cc6d49649116e2cbf7ee992ed35" @@ -6520,14 +6368,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/ionicons-solid@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/ionicons-solid/-/ionicons-solid-10.46.0.tgz#57909df67c7cdb710623fc9a58c20732f3520f81" - integrity sha512-agiuzQzqrrRWHrGfswC6EciKVjt/XSZuQFbvP/s6qU2oYkQuJRdhmAZQldTaj9Xb2GyAmEjM0cmkWG3+JzV7CQ== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/material-outlined@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/material-outlined/-/material-outlined-10.34.0.tgz#5da422bc14dbc0ad0b4e7e15153056866f42f37b" @@ -6536,14 +6376,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/material-outlined@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/material-outlined/-/material-outlined-10.47.0.tgz#d799a14c1cbbd4d730d046d9f791f108e907fd34" - integrity sha512-/QeDSGXlfRoIsgx4g4Hb//xhsucD4mJJsNPk/e1XzckxkNG+YHCIjbAHzDwxwNfSCJYcTDcOp2SZcoS7iyNGlw== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/material-rounded@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/material-rounded/-/material-rounded-10.34.0.tgz#8a8a1c35215a9c035da51ae5e4797821e5d07a23" @@ -6552,14 +6384,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/material-rounded@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/material-rounded/-/material-rounded-10.47.0.tgz#c2a9e8277ba88949caffe08d42360d7aa45afaa8" - integrity sha512-+ByhDd1FJept3k8iBDxMWSzmIh29UrgZTIzh2pADWldGrsD/2JKdsC7knQghSj9uCevHNMKEeVaYBQMLoNUjvw== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/material-sharp@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/material-sharp/-/material-sharp-10.34.0.tgz#b1d95bab46e8f4a3fb35446b9d7e1f7bcc942cde" @@ -6568,14 +6392,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/material-sharp@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/material-sharp/-/material-sharp-10.47.0.tgz#d019acd9acf49e81b81a10d0ccf06356d301ab7f" - integrity sha512-U9bjvur/vawfiBhE75efNOF4WkSAygn26bQvHFJPc71ZCisvgJncnlSmR0rUgWnu7Cp/qg6faDH5CKDXBmGWCA== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/material-twotone@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/material-twotone/-/material-twotone-10.34.0.tgz#91983def41f87e17d18d6d3d1fbbc4e6abb56106" @@ -6584,14 +6400,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/material-twotone@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/material-twotone/-/material-twotone-10.47.0.tgz#0308c1b26cc42c77ed3f4f82150666192dfee262" - integrity sha512-c4Q1r0EJaDEI1/IsBWo0Mo8lZZvtA/3Or1ScUcmjwKBZxpR8960uGy4CReLzBPALC4L6aPiM1H168fz39fm4oQ== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/material@10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@styled-icons/material/-/material-10.34.0.tgz#479bd36834d26e2b8e2ed06813a141a578ea6008" @@ -6600,14 +6408,6 @@ "@babel/runtime" "^7.14.0" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/material@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/material/-/material-10.47.0.tgz#23c19f9659cd135ea44550b88393621bb81f81b4" - integrity sha512-6fwoLPHg3P9O/iXSblQ67mchgURJvhU7mfba29ICfpg62zJ/loEalUgspm1GGtYVSPtkejshVWUtV99dXpcQfg== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/octicons@10.44.0": version "10.44.0" resolved "https://registry.yarnpkg.com/@styled-icons/octicons/-/octicons-10.44.0.tgz#d7b6366c74f1fa129914956f6fb83a084c0dee27" @@ -6616,14 +6416,6 @@ "@babel/runtime" "^7.15.4" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/octicons@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@styled-icons/octicons/-/octicons-10.47.0.tgz#a062f275730c1bf70df0b19fe41e9f0db9c24f5d" - integrity sha512-JOqEbwbh23u/AdaINod8ZeVN5MEcOvkSeMTwGIPaPgz5PNuWRj/+1LpixmBeZjAr/WhB0pxZBBwA+e91BelQCA== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/open-iconic@10.18.0": version "10.18.0" resolved "https://registry.yarnpkg.com/@styled-icons/open-iconic/-/open-iconic-10.18.0.tgz#658bd6aee9232d0983c7aa8949713221c7d5bb87" @@ -6632,14 +6424,6 @@ "@babel/runtime" "^7.10.5" "@styled-icons/styled-icon" "^10.6.0" -"@styled-icons/open-iconic@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/open-iconic/-/open-iconic-10.46.0.tgz#ddaa4ead799eae861ee21abea9d2b1484e2b6089" - integrity sha512-v7wrHcUACQeSfJrLan/jXxgz7RSlJJXSc2u33UR82ewkOSBhaXp/zZxKF1tFCT2spvth0NBl6OkZUCw9ctgyrA== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/remix-editor@10.33.0": version "10.33.0" resolved "https://registry.yarnpkg.com/@styled-icons/remix-editor/-/remix-editor-10.33.0.tgz#ee348658f2d44cef409004a077f2280620b9307d" @@ -6648,14 +6432,6 @@ "@babel/runtime" "^7.13.10" "@styled-icons/styled-icon" "^10.6.0" -"@styled-icons/remix-editor@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/remix-editor/-/remix-editor-10.46.0.tgz#81c0d3f174ff5fb1900a019acbeb4fc1f68318a1" - integrity sha512-oOrt6wj5//4LrZkm40bXcsFpTgXbdOkixu6RHuE3O82+Hqtw1bYR/smm5MbLOJ+Kz62SEjDF3sxqFO23ITDeUQ== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/remix-fill@10.18.0": version "10.18.0" resolved "https://registry.yarnpkg.com/@styled-icons/remix-fill/-/remix-fill-10.18.0.tgz#7a7b007b6d3e97ff3b63fc07f7af1d365245b25a" @@ -6664,14 +6440,6 @@ "@babel/runtime" "^7.10.5" "@styled-icons/styled-icon" "^10.6.0" -"@styled-icons/remix-fill@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/remix-fill/-/remix-fill-10.46.0.tgz#4477b1927e99faec55747bd92102b85e979ac203" - integrity sha512-D2rWGJ9/7BR+3TMvmIoWGASMfyhWT4lTF+we8h9Pya5Ye+69cftvp817DMuaR/6czCugXTrB++HTQX0XJfoBFw== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/remix-line@10.18.0": version "10.18.0" resolved "https://registry.yarnpkg.com/@styled-icons/remix-line/-/remix-line-10.18.0.tgz#f6bd167883fb46a0103d60a8f4106823740e4b3e" @@ -6680,14 +6448,6 @@ "@babel/runtime" "^7.10.5" "@styled-icons/styled-icon" "^10.6.0" -"@styled-icons/remix-line@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/remix-line/-/remix-line-10.46.0.tgz#8c66a18f951895f3e082a60b5a6a4f43b3c7b998" - integrity sha512-TkbtXdgcuM7VpE/51k8+sxfReFjSQpAFVnjJi8/gxwcTzjdOG7Plkgsaixi2+hiLk/Coj/+67KbntBoSevROsw== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/simple-icons@10.45.0": version "10.45.0" resolved "https://registry.yarnpkg.com/@styled-icons/simple-icons/-/simple-icons-10.45.0.tgz#fc102e514e0b417cc8cd3b773cc33005a07852dc" @@ -6696,14 +6456,6 @@ "@babel/runtime" "^7.15.4" "@styled-icons/styled-icon" "^10.6.3" -"@styled-icons/simple-icons@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/simple-icons/-/simple-icons-10.46.0.tgz#fbb8f73686dbb40e482356a5fdc23e895e2b8468" - integrity sha512-zHkbGqAqFOwpqDjbhKTKsAXNxtBOXb7Ot2eKoDaDFckJGr2shAXRchclUS6wSixSPwQIPGAUcdO7Cq744Ollng== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/styled-icon@10.6.3", "@styled-icons/styled-icon@^10.6.0", "@styled-icons/styled-icon@^10.6.3": version "10.6.3" resolved "https://registry.yarnpkg.com/@styled-icons/styled-icon/-/styled-icon-10.6.3.tgz#eae0e5e18fd601ac47e821bb9c2e099810e86403" @@ -6712,13 +6464,6 @@ "@babel/runtime" "^7.10.5" "@emotion/is-prop-valid" "^0.8.7" -"@styled-icons/styled-icon@10.7.1": - version "10.7.1" - resolved "https://registry.yarnpkg.com/@styled-icons/styled-icon/-/styled-icon-10.7.1.tgz#da04b80751e126756f98a5485b3b0dd9b52c9aba" - integrity sha512-WLYaeMTMhMkSxE+v+of+r2ovIk0tceDGfv8iqWHRMxvbm+6zxngVcQ4ELx6Zt/LFxqckmmoAdvo6ehiiYj6I6A== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/styled-icon@^10.7.0": version "10.7.0" resolved "https://registry.yarnpkg.com/@styled-icons/styled-icon/-/styled-icon-10.7.0.tgz#d6960e719b8567c8d0d3a87c40fb6f5b4952a228" @@ -6734,14 +6479,6 @@ "@babel/runtime" "^7.10.5" "@styled-icons/styled-icon" "^10.6.0" -"@styled-icons/typicons@10.46.0": - version "10.46.0" - resolved "https://registry.yarnpkg.com/@styled-icons/typicons/-/typicons-10.46.0.tgz#b72c381941fbe66d3a34dbf2979611d25579cb2e" - integrity sha512-yCJnVggGsbxOyuIPEmD+9IYRvB5w41hpJKdpI0ErasYG9Izt/lGqUaaDaxR39u9s28Q54Fq/v+Ni17dFCs8FOw== - dependencies: - "@babel/runtime" "^7.19.0" - "@styled-icons/styled-icon" "^10.7.0" - "@styled-icons/zondicons@10.18.0": version "10.18.0" resolved "https://registry.yarnpkg.com/@styled-icons/zondicons/-/zondicons-10.18.0.tgz#56fd377ffb8412495694e4b19cb72b5bbd38f744" @@ -21270,50 +21007,6 @@ styled-icons@^10.34.0: "@styled-icons/typicons" "10.18.0" "@styled-icons/zondicons" "10.18.0" -styled-icons@^10.47.1: - version "10.47.1" - resolved "https://registry.yarnpkg.com/styled-icons/-/styled-icons-10.47.1.tgz#74511ca779147f482eba7434b0e5ca1fa8c8f8a6" - integrity sha512-O6SguU8Z8Qk+rWJkiPmoLOxCQ3x8Emabue2r4NPqX+CK1uyaNahzFtKaGq/0d13RTWXqfVOBUSIJZaIlu4G/CA== - dependencies: - "@babel/runtime" "^7.20.7" - "@styled-icons/bootstrap" "10.47.0" - "@styled-icons/boxicons-logos" "10.47.0" - "@styled-icons/boxicons-regular" "10.47.0" - "@styled-icons/boxicons-solid" "10.47.0" - "@styled-icons/crypto" "10.47.0" - "@styled-icons/entypo" "10.46.0" - "@styled-icons/entypo-social" "10.46.0" - "@styled-icons/evaicons-outline" "10.46.0" - "@styled-icons/evaicons-solid" "10.46.0" - "@styled-icons/evil" "10.46.0" - "@styled-icons/fa-brands" "10.47.0" - "@styled-icons/fa-regular" "10.47.0" - "@styled-icons/fa-solid" "10.47.0" - "@styled-icons/feather" "10.47.0" - "@styled-icons/fluentui-system-filled" "10.47.0" - "@styled-icons/fluentui-system-regular" "10.47.0" - "@styled-icons/foundation" "10.46.0" - "@styled-icons/heroicons-outline" "10.47.0" - "@styled-icons/heroicons-solid" "10.47.0" - "@styled-icons/icomoon" "10.46.0" - "@styled-icons/ionicons-outline" "10.46.0" - "@styled-icons/ionicons-sharp" "10.46.0" - "@styled-icons/ionicons-solid" "10.46.0" - "@styled-icons/material" "10.47.0" - "@styled-icons/material-outlined" "10.47.0" - "@styled-icons/material-rounded" "10.47.0" - "@styled-icons/material-sharp" "10.47.0" - "@styled-icons/material-twotone" "10.47.0" - "@styled-icons/octicons" "10.47.0" - "@styled-icons/open-iconic" "10.46.0" - "@styled-icons/remix-editor" "10.46.0" - "@styled-icons/remix-fill" "10.46.0" - "@styled-icons/remix-line" "10.46.0" - "@styled-icons/simple-icons" "10.46.0" - "@styled-icons/styled-icon" "10.7.1" - "@styled-icons/typicons" "10.46.0" - "@styled-icons/zondicons" "10.46.0" - stylelint-config-prettier@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-5.3.0.tgz#a6da626c2edabb2c5207bcf63fe449c16f5a24ec" From d6f3c07697c16b3e6efd40ea57f3877ce758b492 Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Thu, 12 Sep 2024 17:01:16 -0500 Subject: [PATCH 5/9] add random id and styledIcon typing --- packages/building-blocks/src/Alert.tsx | 3 ++- packages/building-blocks/src/stories/alerts.story.tsx | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/building-blocks/src/Alert.tsx b/packages/building-blocks/src/Alert.tsx index ffbaa1942..0023cc397 100644 --- a/packages/building-blocks/src/Alert.tsx +++ b/packages/building-blocks/src/Alert.tsx @@ -3,6 +3,7 @@ import styled from "styled-components"; import AnimateHeight from "react-animate-height"; import { ChevronUp } from "@styled-icons/bootstrap/ChevronUp"; import { Bell } from "@styled-icons/bootstrap/Bell"; +import { StyledIcon } from "@styled-icons/styled-icon"; import blue from "./colors/blue"; interface Props { @@ -11,7 +12,7 @@ interface Props { backgroundColor?: string; collapsible?: boolean; children?: ReactChild; - Icon?: any; + Icon?: StyledIcon; } const AlertContainer = styled.div<{ diff --git a/packages/building-blocks/src/stories/alerts.story.tsx b/packages/building-blocks/src/stories/alerts.story.tsx index 6b3aad746..64719ef9d 100644 --- a/packages/building-blocks/src/stories/alerts.story.tsx +++ b/packages/building-blocks/src/stories/alerts.story.tsx @@ -33,13 +33,15 @@ const alerts = [ } ]; +const alertKey = crypto.randomUUID(); + const AlertContent = () => { return ( <> {alerts.map((alert, i) => { return ( <> -
+
{`${i + 1}) `} {alert.alertDescriptionText}
From b8ef316cffa3d72a123b5ba08c9711a15d283577 Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:59:37 -0500 Subject: [PATCH 6/9] Move into folder and add button label --- packages/building-blocks/i18n/en-US.yml | 4 ++++ .../building-blocks/src/{ => alert}/Alert.tsx | 15 +++++++++++++-- .../building-blocks/src/stories/alerts.story.tsx | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 packages/building-blocks/i18n/en-US.yml rename packages/building-blocks/src/{ => alert}/Alert.tsx (87%) diff --git a/packages/building-blocks/i18n/en-US.yml b/packages/building-blocks/i18n/en-US.yml new file mode 100644 index 000000000..153b1e162 --- /dev/null +++ b/packages/building-blocks/i18n/en-US.yml @@ -0,0 +1,4 @@ +otpUi: + buildingBlocks: + alert: + expand: Expand diff --git a/packages/building-blocks/src/Alert.tsx b/packages/building-blocks/src/alert/Alert.tsx similarity index 87% rename from packages/building-blocks/src/Alert.tsx rename to packages/building-blocks/src/alert/Alert.tsx index 0023cc397..7a5f4eef6 100644 --- a/packages/building-blocks/src/Alert.tsx +++ b/packages/building-blocks/src/alert/Alert.tsx @@ -4,7 +4,8 @@ import AnimateHeight from "react-animate-height"; import { ChevronUp } from "@styled-icons/bootstrap/ChevronUp"; import { Bell } from "@styled-icons/bootstrap/Bell"; import { StyledIcon } from "@styled-icons/styled-icon"; -import blue from "./colors/blue"; +import { useIntl } from "react-intl"; +import blue from "../colors/blue"; interface Props { alertHeader: string; @@ -90,6 +91,11 @@ const Alert = ({ Icon = Bell }: Props): JSX.Element => { const [expandAlert, setExpandAlert] = useState(false); + const intl = useIntl(); + const label = intl.formatMessage({ + id: "otpUi.buildingBlocks.alert.expand", + defaultMessage: "Expand" + }); return ( {alertHeader} {collapsible && ( - )} diff --git a/packages/building-blocks/src/stories/alerts.story.tsx b/packages/building-blocks/src/stories/alerts.story.tsx index 64719ef9d..c737ab0b9 100644 --- a/packages/building-blocks/src/stories/alerts.story.tsx +++ b/packages/building-blocks/src/stories/alerts.story.tsx @@ -1,7 +1,7 @@ import React, { ReactElement } from "react"; import { Meta } from "@storybook/react"; import { ExclamationTriangle } from "@styled-icons/bootstrap/ExclamationTriangle"; -import Alert from "../Alert"; +import Alert from "../alert/Alert"; import red from "../colors/red"; const meta: Meta = { From 6ccd3f960cac03e83448286b29a5fe9b72caaddd Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:00:12 -0500 Subject: [PATCH 7/9] update snapshots --- .../__snapshots__/alerts.story.tsx.snap | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 packages/building-blocks/src/stories/__snapshots__/alerts.story.tsx.snap diff --git a/packages/building-blocks/src/stories/__snapshots__/alerts.story.tsx.snap b/packages/building-blocks/src/stories/__snapshots__/alerts.story.tsx.snap new file mode 100644 index 000000000..5fa187bd8 --- /dev/null +++ b/packages/building-blocks/src/stories/__snapshots__/alerts.story.tsx.snap @@ -0,0 +1,104 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Building-Blocks/Alert BasicAlert smoke-test 1`] = ` +
+ + + Next trip starts on Wednesday April 17th + + + + + Trip is due to begin at 7:43 AM (Realtime monitoring will being at 7:13 AM) + +
+
+
+
+ Here is more content +
+
+
+
+
+`; + +exports[`Building-Blocks/Alert CollapsibleAlertWithTransitAlerts smoke-test 1`] = ` +
+ + + Your trip has alerts + + + + +
+ +
+
+`; From 309e6c9212fc39178e41503b0eedc3137acad72a Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:11:28 -0500 Subject: [PATCH 8/9] Add french translation for "expand" --- packages/building-blocks/i18n/fr.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/building-blocks/i18n/fr.yml diff --git a/packages/building-blocks/i18n/fr.yml b/packages/building-blocks/i18n/fr.yml new file mode 100644 index 000000000..87a926396 --- /dev/null +++ b/packages/building-blocks/i18n/fr.yml @@ -0,0 +1,4 @@ +otpUi: + buildingBlocks: + alert: + expand: Développer From 0caf2375592b9936bbe2cf477dcad0903fc1db72 Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 30 Oct 2024 13:37:28 -0500 Subject: [PATCH 9/9] fix random generated key in alert story --- packages/building-blocks/src/stories/alerts.story.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/building-blocks/src/stories/alerts.story.tsx b/packages/building-blocks/src/stories/alerts.story.tsx index c737ab0b9..751a4fba8 100644 --- a/packages/building-blocks/src/stories/alerts.story.tsx +++ b/packages/building-blocks/src/stories/alerts.story.tsx @@ -33,12 +33,11 @@ const alerts = [ } ]; -const alertKey = crypto.randomUUID(); - const AlertContent = () => { return ( <> {alerts.map((alert, i) => { + const alertKey = crypto.randomUUID(); return ( <>