Skip to content

Minimal IE Runtime #446

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.

Sign up for GitHub

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

Closed
wants to merge 4 commits into from
Closed

Minimal IE Runtime #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e0cfcb
ie: Minimal Internet Explorer Runtime
nhooyr Jul 3, 2019
d732540
ie: Implement proper insertion/deletion of styles
nhooyr Jul 3, 2019
994dc23
Move react dependencies to peer dependencies.
nhooyr Jul 3, 2019
0d3acfa
ie: Use forwardRef correctly
nhooyr Jul 3, 2019
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
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"@callstack/eslint-config": "^3.0.2",
"@commitlint/config-conventional": "^7.5.0",
"@release-it/conventional-changelog": "^1.0.2",
"@types/react": "^16.8.4",
"all-contributors-cli": "^6.1.1",
"babel-core": "^7.0.0-bridge.0",
"codecov": "^3.2.0",
Expand All @@ -71,7 +70,6 @@
"husky": "^1.3.1",
"jest": "^24.1.0",
"prettier": "^1.16.4",
"react": "^16.8.3",
"react-test-renderer": "^16.8.3",
"release-it": "^12.2.0"
},
Expand Down Expand Up @@ -99,6 +97,10 @@
"stylis": "^3.5.4",
"yargs": "^13.2.1"
},
"peerDependencies": {
"@types/react": "^16.8.4",
"react": "^16.8.3"
},
"resolutions": {
"**/babel-core": "7.0.0-bridge.0"
},
Expand Down
207 changes: 165 additions & 42 deletions src/react/styled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,96 @@ const warnIfInvalid = (value: any, componentName) => {
}
};

let ieRulesCache;
let ieRulesSheet: CSSStyleSheet;
let ieRulesCacheInited: boolean;

function ieInitRulesCache() {
if (ieRulesCacheInited) {
return;
}
ieRulesCacheInited = true;

document.head.appendChild(document.createElement('style'));
// Last style sheet is ours.
ieRulesSheet = document.styleSheets[document.styleSheets.length - 1];

ieRulesCache = {
map: new Map(),
list: [],
};
}

function ieInsertRule(id: string, rule: string) {
ieInitRulesCache();

// Ensure no rule.
ieDeleteRule(id);

ieRulesSheet.insertRule(rule, ieRulesSheet.cssRules.length);

const cachedRule = {};

ieRulesCache.map.set(id, cachedRule);
ieRulesCache.list.push(cachedRule);
}

function ieDeleteRule(id: string) {
const rule = ieRulesCache.map.get(id);
if (rule) {
const i = ieRulesCache.list.indexOf(rule);

ieRulesSheet.removeRule(i);
ieRulesCache.list.splice(i, 1);
ieRulesCache.map.delete(id);
}
}

function handleIE(comp, options, filteredProps, name, value, unit) {
// IE does not support CSS variables. We need to replace every instance of
// the CSS variable ourselves for all rulesets on filteredProps.className.
// We keep track of which rules we've inserted in a map from className
for (let i = 0; i < document.styleSheets.length; i++) {
const sheet = document.styleSheets[i];

for (let j = 0; j < sheet.cssRules.length; j++) {
const rule = sheet.cssRules[j];

// If the selector contains our class name and the css text includes the variable,
// then we need to adjust our rule for this particular component instance.
if (
rule.selectorText.includes(options.class) &&
rule.cssText.includes(name)
) {
const transformedClassName = `${options.class}-${name}`;
// eslint-disable-next-line no-param-reassign
filteredProps.className = cx(options.class, transformedClassName);

let transformedRule = rule.cssText.replace(
options.class,
transformedClassName
);
transformedRule = transformedRule.replace(
`var(--${name})`,
`${value}${unit}`
);

// Used by lifecycle methods in Component in styled.
// eslint-disable-next-line no-param-reassign
comp.ieInsertRule = () => {
ieInsertRule(transformedClassName, transformedRule);
};
// eslint-disable-next-line no-param-reassign
comp.ieDeleteRule = () => {
ieDeleteRule(transformedClassName);
};
// Only one rule can ever match.
return;
}
}
}
}

function styled(tag: React.ComponentType<*> | string) {
return (options: Options) => {
if (process.env.NODE_ENV !== 'production') {
Expand All @@ -46,67 +136,95 @@ function styled(tag: React.ComponentType<*> | string) {
}
}

const render = (props, ref) => {
const { as: component = tag, class: className, ...rest } = props;
class Component extends React.Component {
componentDidMount() {
if (this.ieInsertRule) {
this.ieInsertRule();
}
}

componentDidUpdate() {
if (this.ieInsertRule) {
this.ieInsertRule();
}
}

componentWillUnmount() {
if (this.ieDeleteRule) {
this.ieDeleteRule();
}
}

render() {
const { props } = this;
const ref = props.innerRef;
const { as: component = tag, class: className, ...rest } = props;

let filteredProps;
let filteredProps;

// Check if it's an HTML tag and not a custom element
if (typeof component === 'string' && component.indexOf('-') === -1) {
filteredProps = {};
// Check if it's an HTML tag and not a custom element
if (typeof component === 'string' && component.indexOf('-') === -1) {
filteredProps = {};

// eslint-disable-next-line guard-for-in
for (const key in rest) {
if (key === 'as' || validAttr(key)) {
// Don't pass through invalid attributes to HTML elements
filteredProps[key] = rest[key];
// eslint-disable-next-line guard-for-in
for (const key in rest) {
if (key === 'as' || validAttr(key)) {
// Don't pass through invalid attributes to HTML elements
filteredProps[key] = rest[key];
}
}
} else {
filteredProps = rest;
}
} else {
filteredProps = rest;
}

filteredProps.ref = ref;
filteredProps.className = cx(
filteredProps.className || className,
options.class
);
filteredProps.ref = ref;
filteredProps.className = cx(
filteredProps.className || className,
options.class
);

const { vars } = options;

const { vars } = options;
if (vars) {
const style = {};

if (vars) {
const style = {};
// eslint-disable-next-line guard-for-in
for (const name in vars) {
const [result, unit = ''] = vars[name];
const value = typeof result === 'function' ? result(props) : result;

// eslint-disable-next-line guard-for-in
for (const name in vars) {
const [result, unit = ''] = vars[name];
const value = typeof result === 'function' ? result(props) : result;
warnIfInvalid(value, options.name);

warnIfInvalid(value, options.name);
style[`--${name}`] = `${value}${unit}`;

style[`--${name}`] = `${value}${unit}`;
if (onInternetExplorer()) {
handleIE(this, options, filteredProps, name, value, unit);
}
}

filteredProps.style = Object.assign(style, filteredProps.style);
}

filteredProps.style = Object.assign(style, filteredProps.style);
}
/* $FlowFixMe */
if (tag.__linaria && tag !== component) {
// If the underlying tag is a styled component, forward the `as` prop
// Otherwise the styles from the underlying component will be ignored
filteredProps.as = component;

/* $FlowFixMe */
if (tag.__linaria && tag !== component) {
// If the underlying tag is a styled component, forward the `as` prop
// Otherwise the styles from the underlying component will be ignored
filteredProps.as = component;
return React.createElement(tag, filteredProps);
}

return React.createElement(tag, filteredProps);
return React.createElement(component, filteredProps);
}

return React.createElement(component, filteredProps);
};
}

const Result = React.forwardRef
? React.forwardRef(render)
? React.forwardRef((props, ref) => (
<Component {...props} innerRef={ref} />
))
: // React.forwardRef won't available on older React versions and in Preact
// Fallback to a innerRef prop in that case
({ innerRef, ...rest }) => render(rest, innerRef);
// Fallback to a innerRef prop directly in that case
Component;

Result.displayName = options.name;

Expand Down Expand Up @@ -150,3 +268,8 @@ type StyledJSXIntrinsics = $ObjMap<
declare module.exports: StyledJSXIntrinsics & {|
<T>(T): StyledTag<React.ElementConfig<T>>,
|};

function onInternetExplorer(): boolean {
const ua = window.navigator.userAgent;
return ua.includes('MSI ') || ua.includes('Trident/');
}
28 changes: 0 additions & 28 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,19 +1131,6 @@
resolved "https://registry.yarnpkg.com/@types/parsimmon/-/parsimmon-1.10.0.tgz#ffb81cb023ff435a41d4710a29ab23c561dc9fdf"
integrity sha512-bsTIJFVQv7jnvNiC42ld2pQW2KRI+pAG243L+iATvqzy3X6+NH1obz2itRKDZZ8VVhN3wjwYax/VBGCcXzgTqQ==

"@types/prop-types@*":
version "15.5.6"
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.6.tgz#9c03d3fed70a8d517c191b7734da2879b50ca26c"
integrity sha512-ZBFR7TROLVzCkswA3Fmqq+IIJt62/T7aY/Dmz+QkU7CaW2QFqAitCE8Ups7IzmGhcN1YWMBT4Qcoc07jU9hOJQ==

"@types/react@^16.8.4":
version "16.8.4"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.4.tgz#134307f5266e866d5e7c25e47f31f9abd5b2ea34"
integrity sha512-Mpz1NNMJvrjf0GcDqiK8+YeOydXfD8Mgag3UtqQ5lXYTsMnOiHcKmO48LiSWMb1rSHB9MV/jlgyNzeAVxWMZRQ==
dependencies:
"@types/prop-types" "*"
csstype "^2.2.0"

JSONStream@^1.0.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
Expand Down Expand Up @@ -2374,11 +2361,6 @@ cssstyle@^1.0.0:
dependencies:
cssom "0.3.x"

csstype@^2.2.0:
version "2.5.7"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.7.tgz#bf9235d5872141eccfb2d16d82993c6b149179ff"
integrity sha512-Nt5VDyOTIIV4/nRFswoCKps1R5CD1hkiyjBE9/thNaNZILLEviVw9yWQw15+O+CpNjQKB/uvdcxFFOrSflY3Yw==

currently-unhandled@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
Expand Down Expand Up @@ -6236,16 +6218,6 @@ react-test-renderer@^16.8.3:
react-is "^16.8.3"
scheduler "^0.13.3"

react@^16.8.3:
version "16.8.3"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9"
integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.3"

read-pkg-up@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
Expand Down