Skip to content

Rely on DOMContentLoaded instead of onload #207

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

Merged
merged 7 commits into from
Dec 31, 2022
Merged

Rely on DOMContentLoaded instead of onload #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39262db
Rely on DOMContentLoaded instead of onload
ryanseddon Jan 11, 2022
bdf5b70
v5.2.2-alpha.0
ryanseddon Jan 11, 2022
ae128fd
Seems to still have issues on chrome for some apps trying something else
ryanseddon Feb 1, 2022
41c94d3
v5.2.2-alpha.1
ryanseddon Feb 1, 2022
28584e8
Fallback to setInterval if DOMContentLoaded fails
ryanseddon May 16, 2022
d67cd27
v5.2.3-alpha.0
ryanseddon Jul 6, 2022
c092f57
Merge branch 'master' into domcontentloaded
ryanseddon Dec 30, 2022
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
1 change: 1 addition & 0 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"parser": "babel-eslint",
"rules": {
"react/forbid-prop-types": "off",
"react/prop-types": [0, { "ignore": ["children"]}],
"no-underscore-dangle": "off"
}
}
53 changes: 42 additions & 11 deletions example/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import React from 'react';
import ReactDOM from 'react-dom';
import Frame from '../src';

var styles = {
const styles = {
border: '1px solid',
width: '100%',
height: '100%'
};

const Header = ({ children }) => <h1>{children}</h1>;

const Content = ({ children }) => <section>{children}</section>
const Content = ({ children }) => <section>{children}</section>;

const App = () => (
<div>
Expand All @@ -21,15 +21,46 @@ const App = () => (
</div>
);

ReactDOM.render(<Frame style={styles}><App /></Frame>, document.querySelector('#example1'));

const Foobar = () => (
<Frame style={styles} head={
<style>{'*{color:red}'}</style>
}>
<h1>Frame example of wrapping component</h1>
<p>This is also showing encapuslated styles. All text is red inside this component.</p>
</Frame>
ReactDOM.render(
<Frame style={styles}>
<App />
</Frame>,
document.querySelector('#example1')
);

const Foobar = () => {
const [toggle, updateToggle] = React.useState(false);
return (
<Frame style={styles} head={<style>{'*{color:red}'}</style>}>
<h1>Frame example of wrapping component</h1>
<p>
This is also showing encapuslated styles. All text is red inside this
component.
</p>
{toggle && <h2>Hello</h2>}
<button onClick={() => updateToggle(!toggle)}>Toggle</button>
</Frame>
);
};

ReactDOM.render(<Foobar />, document.querySelector('#example2'));

const ExternalResources = () => {
const initialContent = `<!DOCTYPE html><html><head>
<link href="//use.fontawesome.com/releases/v5.15.1/css/all.css" rel="stylesheet" />
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
<base target=_blank>
</head><body style='overflow: hidden'><div></div></body></html>`;

return (
<Frame initialContent={initialContent}>
<h1>External Resources</h1>
<p>
This tests loading external resources via initialContent which can
create timing issues with onLoad and srcdoc in cached situations
</p>
</Frame>
);
};

ReactDOM.render(<ExternalResources />, document.querySelector('#example3'));
10 changes: 6 additions & 4 deletions example/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
* {
color: blue;
}
section {
display: flex;
iframe {
width: 100%;
}
section div {
flex: 1;
section {
display: grid;
grid-template-columns: repeat(2, 1fr);
}
</style>
</head>
Expand All @@ -21,6 +22,7 @@ <h1>&lt;Frame /> examples</h1>
<section>
<div id="example1"></div>
<div id="example2"></div>
<div id="example3"></div>
</section>
</body>
</html>
28 changes: 22 additions & 6 deletions src/Frame.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,22 @@ export class Frame extends Component {
this._isMounted = true;

const doc = this.getDoc();
if (doc && doc.readyState === 'complete') {
this.forceUpdate();
} else {
this.nodeRef.current.addEventListener('load', this.handleLoad);

if (doc) {
this.nodeRef.current.contentWindow.addEventListener(
'DOMContentLoaded',
this.handleLoad
);
}
}

componentWillUnmount() {
this._isMounted = false;

this.nodeRef.current.removeEventListener('load', this.handleLoad);
this.nodeRef.current.removeEventListener(
'DOMContentLoaded',
this.handleLoad
);
}

getDoc() {
Expand All @@ -81,9 +86,19 @@ export class Frame extends Component {
};

handleLoad = () => {
this.setState({ iframeLoaded: true });
clearInterval(this.loadCheck);
// Bail update as some browsers will trigger on both DOMContentLoaded & onLoad ala firefox
if (!this.state.iframeLoaded) {
this.setState({ iframeLoaded: true });
}
};

// In certain situations on a cold cache DOMContentLoaded never gets called
// fallback to an interval to check if that's the case
loadCheck = setInterval(function loadCheckCallback() {
this.handleLoad();
}, 500);

renderFrameContents() {
if (!this._isMounted) {
return null;
Expand Down Expand Up @@ -130,6 +145,7 @@ export class Frame extends Component {
delete props.contentDidMount;
delete props.contentDidUpdate;
delete props.forwardedRef;

return (
<iframe {...props} ref={this.setRef} onLoad={this.handleLoad}>
{this.state.iframeLoaded && this.renderFrameContents()}
Expand Down
5 changes: 5 additions & 0 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,10 @@ module.exports = {
loaders: [
{ test: /\.js(x|)/, loaders: ['babel-loader'], exclude: /node_modules/ }
]
},
devServer: {
headers: {
'Cache-Control': 'max-age=10'
}
}
};