Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improove style isolation #410

Merged
merged 5 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/donate-button-v4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"@babel/preset-typescript": "^7.13.0",
"@testing-library/react": "^11.2.5",
"@types/big.js": "^6.2.2",
"@types/cxs": "^6.2.1",
"ava": "^3.15.0",
"babel-core": "^7.0.0-bridge.0",
"babel-plugin-jsx-pragmatic": "^1.0.2",
Expand Down Expand Up @@ -61,7 +60,6 @@
"dependencies": {
"@stripe/stripe-js": "^1.53.0",
"big.js": "^6.2.1",
"cxs": "^6.2.0",
"fuzzy": "^0.1.3",
"preact": "^10.17.1"
}
Expand Down
17 changes: 3 additions & 14 deletions packages/donate-button-v4/src/autoPlayMode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {parseDonateUrl} from 'src/helpers/parseDonateUrl';
import shouldApplyEveryStyleForAllLinks from 'src/helpers/shouldApplyEveryStyleForAllLinks';
import {loadFonts} from 'src/loadFonts';
import {WidgetLoader} from 'src/loaders/Widgetloader';
import resetcss from 'src/resetCss';

const OBSERVER_OPTIONS = {
childList: true,
Expand Down Expand Up @@ -83,20 +82,10 @@ function mountWidgetContainer() {
widgetContainer.id = 'widget-container';
shadowRoot.append(widgetContainer);

const everyStyles: HTMLStyleElement | null =
document.querySelector('#every-styles');
const everyShadowStyles = document.createElement('style');
everyShadowStyles.id = 'every-shadow-styles';

if (everyStyles) {
const rules = Object.values(everyStyles.sheet?.cssRules ?? {})
.map((rule) => rule.cssText)
.join('\n');

const everyShadowStyles = document.createElement('style');
everyShadowStyles.id = 'every-shadow-styles';
everyShadowStyles.innerHTML = resetcss + rules;

widgetContainer.append(everyShadowStyles);
}
widgetContainer.append(everyShadowStyles);
}

function createWidget(options: CreateWidgetProps, urlString: string) {
Expand Down
10 changes: 4 additions & 6 deletions packages/donate-button-v4/src/components/embed-button/styles.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import cxs from 'cxs';
import {FontFamily} from 'src/components/widget/theme/font-family';
import {cssButton} from 'src/helpers/css';

cxs.prefix('every-embedded-');

export const buttonCss = cxs({
export const buttonCss = cssButton({
display: 'flex',
alignItems: 'center',
width: 'max-content',
Expand All @@ -25,13 +23,13 @@ export const buttonCss = cxs({
'&:hover': {backgroundColor: '#2F806D'}
});

export const logoCss = cxs({
export const logoCss = cssButton({
width: '16px',
height: '16px',
fill: '#fff',
marginRight: '8px'
});

export const verticalCenterTextCss = cxs({
export const verticalCenterTextCss = cssButton({
transform: 'translateY(0.08em)'
});
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import cxs from 'cxs';
import {COLORS} from 'src/components/widget/theme/colors';
import {Spacing} from 'src/components/widget/theme/spacing';
import css from 'src/helpers/css';

/* Hide checkbox visually but remain accessible to screen readers.
Source: https://polished.js.org/docs/#hidevisually */
export const hiddenCheckboxCss = cxs({
export const hiddenCheckboxCss = css({
border: 0,
clip: 'rect(0 0 0 0)',
clipPath: 'inset(50%)',
Expand All @@ -24,7 +24,7 @@ export const checkboxCss = ({
checked?: boolean;
primaryColor: string;
}) =>
cxs({
css({
cursor: 'pointer',
width: '24px',
minWidth: '24px',
Expand All @@ -37,7 +37,7 @@ export const checkboxCss = ({
...(checked ? {background: primaryColor} : {})
});

export const checkMarkIconCss = cxs({
export const checkMarkIconCss = css({
width: '16px',
height: '16px',
'& > path': {
Expand All @@ -46,11 +46,11 @@ export const checkMarkIconCss = cxs({
}
});

export const checkboxLabelTextCss = cxs({
export const checkboxLabelTextCss = css({
cursor: 'pointer'
});

export const checkboxLabelContainerCss = cxs({
export const checkboxLabelContainerCss = css({
display: 'flex',
alignItems: 'center',
gap: Spacing.XS
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import cxs from 'cxs';
import {CloseIcon} from 'src/components/widget/icons/CloseIcon';
import {Spacing} from 'src/components/widget/theme/spacing';
import css from 'src/helpers/css';

const errorMessageCss = cxs({
const errorMessageCss = css({
display: 'flex',
alignItems: 'center',
gap: Spacing.XXS,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
import cxs from 'cxs';
import {BREAKPOINTS} from 'src/components/widget/theme/breakpoints';
import {COLORS} from 'src/components/widget/theme/colors';
import {textSize} from 'src/components/widget/theme/font-sizes';
import {horizontalStackCss, Spacing} from 'src/components/widget/theme/spacing';
import css, {CSSObject} from 'src/helpers/css';

export const faqListCss = cxs({
export const faqListCss = css({
display: 'flex',
flexDirection: 'column',
gap: Spacing.M
});

export const rotateCss: cxs.CSSObject = {
export const rotateCss: CSSObject = {
position: 'relative',
top: '-1px',
transform: 'rotate(180deg)'
};

export const descriptionBaseCss: cxs.CSSObject = {
export const descriptionBaseCss: CSSObject = {
'> p': {
marginBottom: Spacing.XS
}
};
export const descriptionOpen = cxs({
export const descriptionOpen = css({
...descriptionBaseCss,
maxHeight: '1000px',
transition: 'all 1s',
opacity: '1'
});

export const descriptionClose = cxs({
export const descriptionClose = css({
...descriptionBaseCss,
opacity: '0',
overflow: 'hidden',
Expand All @@ -37,7 +37,7 @@ export const descriptionClose = cxs({
});

export const faqItemConateinerCss = (mobileOnly?: boolean) =>
cxs({
css({
...textSize.xs,
...(mobileOnly
? {
Expand All @@ -49,8 +49,8 @@ export const faqItemConateinerCss = (mobileOnly?: boolean) =>
});

export const faqItemButtonCss = (isOpen: boolean) =>
cxs({
...horizontalStackCss.cxs(Spacing.S),
css({
...horizontalStackCss.css(Spacing.S),
...textSize.xs,
alignItems: 'center',
justifyContent: 'space-between',
Expand All @@ -75,7 +75,7 @@ export const faqItemButtonCss = (isOpen: boolean) =>
})
});

export const faqLinkCss = cxs({
export const faqLinkCss = css({
color: COLORS.Text,
fontWeight: 500,
textDecoration: 'none',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import cxs from 'cxs';
import {BREAKPOINTS} from 'src/components/widget/theme/breakpoints';
import {COLORS} from 'src/components/widget/theme/colors';
import {textSize} from 'src/components/widget/theme/font-sizes';
import {Spacing} from 'src/components/widget/theme/spacing';
import css from 'src/helpers/css';

export const footerCardCss = cxs({
export const footerCardCss = css({
padding: `${Spacing.XL} ${Spacing.XL} 0px`,
backgroundColor: 'unset',

Expand All @@ -23,7 +23,7 @@ export const footerCardCss = cxs({
}
});

export const footerLinkCss = cxs({
export const footerLinkCss = css({
color: COLORS.TextGray,
fontWeight: 500,
textDecoration: 'none',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import cxs from 'cxs';
import {BREAKPOINTS} from 'src/components/widget/theme/breakpoints';
import css from 'src/helpers/css';

export const linkCss = (primaryColor: string) =>
cxs({
css({
color: primaryColor,
fontWeight: 500,
textDecoration: 'none',
Expand All @@ -11,7 +11,7 @@ export const linkCss = (primaryColor: string) =>
}
});

export const cardCss = cxs({
export const cardCss = css({
display: 'none',
[BREAKPOINTS.TabletLandscapeUp]: {
display: 'block'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import cxs from 'cxs';
import {FunctionalComponent} from 'preact';
import {BREAKPOINTS} from 'src/components/widget/theme/breakpoints';
import {Spacing} from 'src/components/widget/theme/spacing';
import css from 'src/helpers/css';

const gridCss = cxs({
const gridCss = css({
display: 'grid',
gridGap: 0,
gridTemplateColumns: '1fr',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import cxs from 'cxs';
import {BREAKPOINTS} from 'src/components/widget/theme/breakpoints';
import {Spacing} from 'src/components/widget/theme/spacing';
import css from 'src/helpers/css';

export const cardCss = cxs({
export const cardCss = css({
backgroundColor: 'white',
padding: `${Spacing.XL} ${Spacing.XL} 0px`,
borderRadius: 'unset',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import cxs from 'cxs';
import {BREAKPOINTS} from 'src/components/widget/theme/breakpoints';
import {FontFamily} from 'src/components/widget/theme/font-family';
import {Spacing} from 'src/components/widget/theme/spacing';
import css from 'src/helpers/css';

export const buttonCss = cxs({
export const buttonCss = css({
cursor: 'pointer',
display: 'inline-flex',
alignItems: 'center',
Expand All @@ -14,14 +14,14 @@ export const buttonCss = cxs({
fontFamily: FontFamily.BasisGrotesque
});

export const smallScreenCloseButtonCss = cxs({
export const smallScreenCloseButtonCss = css({
display: 'block',
[BREAKPOINTS.TabletLandscapeUp]: {
display: 'none'
}
});

export const largeScreenCloseButtonCss = cxs({
export const largeScreenCloseButtonCss = css({
position: 'absolute',
right: Spacing.XL,
top: Spacing.XL,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import cxs from 'cxs';
import {BREAKPOINTS} from 'src/components/widget/theme/breakpoints';
import {Spacing} from 'src/components/widget/theme/spacing';
import css from 'src/helpers/css';

export const containerCss = cxs({
export const containerCss = css({
display: 'flex',
justifyContent: 'flex-end',
alignItems: 'center',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import cxs from 'cxs';
import {Fragment} from 'preact/jsx-runtime';
import {GridCard} from 'src/components/widget/components/GridCard';
import {
Expand All @@ -13,11 +12,12 @@ import {
import {useNonprofitOrError} from 'src/components/widget/hooks/useNonprofit';
import {Fundraiser} from 'src/components/widget/types/Fundraiser';
import {LOGO_IMAGE_PLACEHOLDER_ID} from 'src/constants/placeholders';
import css from 'src/helpers/css';
import {getCloudinaryUrl} from 'src/helpers/getCloudinaryUrl';
import joinClassNames from 'src/helpers/joinClassNames';

const coverImageCss = (url: string) =>
cxs({
css({
backgroundImage: `url(${url})`,
backgroundSize: 'cover',
width: 'calc(100% + 25px + 25px)',
Expand Down
Loading
Loading