Hoc pattern, test fixes and clean-ups #34
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,23 @@ | ||
| import { Component, createElement } from "react"; | ||
| import PropTypes from "prop-types"; | ||
|
|
||
| let SCRIPT_MAP = {}; | ||
|
|
||
| // A counter used to generate a unique id for each component that uses the function | ||
| let idCount = 0; | ||
|
|
||
| export default function makeAsyncScript(getScriptURL, options) { | ||
|
There was a problem hiding this comment. The below diff looks intense, but mostly just indentation due to HOC 😢 biggest changes are:
There was a problem hiding this comment. can remove the whitespace from the diff => https://github.com/dozoisch/react-async-script/pull/34/files?w=1 . w=1 makes it easier to review in this case :) There was a problem hiding this comment. ^ that's awesome... i need to remember that for all time.. lol |
||
| options = options || {}; | ||
| return function wrapWithAsyncScript(WrappedComponent) { | ||
| const wrappedComponentName = | ||
| WrappedComponent.displayName || WrappedComponent.name || "Component"; | ||
|
|
||
| class AsyncScriptLoader extends Component { | ||
| constructor(props, context) { | ||
| super(props, context) | ||
| this.state = {}; | ||
| this.__scriptURL = ""; | ||
| this.assignChildComponent = this.assignChildComponent.bind(this); | ||
| } | ||
|
|
||
| asyncScriptLoaderGetScriptLoaderID() { | ||
|
|
@@ -31,12 +33,19 @@ export default function makeAsyncScript(Component, getScriptURL, options) { | |
| return this.__scriptURL; | ||
| } | ||
|
|
||
| assignChildComponent(ref) { | ||
| this.__childComponent = ref; | ||
| } | ||
|
|
||
| getComponent() { | ||
| return this.__childComponent; | ||
| } | ||
|
|
||
| asyncScriptLoaderHandleLoad(state) { | ||
| // use reacts setState callback to fire props.asyncScriptOnLoad with new state/entry | ||
| this.setState(state, | ||
| () => this.props.asyncScriptOnLoad && this.props.asyncScriptOnLoad(this.state) | ||
| ); | ||
| } | ||
|
|
||
| asyncScriptLoaderTriggerOnScriptLoaded() { | ||
|
|
@@ -54,20 +63,30 @@ export default function makeAsyncScript(Component, getScriptURL, options) { | |
| const scriptURL = this.setupScriptURL(); | ||
| const key = this.asyncScriptLoaderGetScriptLoaderID(); | ||
| const { globalName, callbackName } = options; | ||
|
|
||
| // check if global object already attached to window | ||
| if (globalName && typeof window[globalName] !== "undefined") { | ||
| SCRIPT_MAP[scriptURL] = { loaded: true, observers: {} }; | ||
| } | ||
|
|
||
| // check if script loading already | ||
| if (SCRIPT_MAP[scriptURL]) { | ||
| let entry = SCRIPT_MAP[scriptURL]; | ||
| // if loaded or errored then "finish" | ||
| if (entry && (entry.loaded || entry.errored)) { | ||
| this.asyncScriptLoaderHandleLoad(entry); | ||
| return; | ||
| } | ||
| // if still loading then callback to observer queue | ||
| entry.observers[key] = entry => this.asyncScriptLoaderHandleLoad(entry); | ||
| return; | ||
| } | ||
|
|
||
| /* | ||
| * hasn't started loading | ||
| * start the "magic" | ||
| * setup script to load and observers | ||
| */ | ||
| let observers = {}; | ||
| observers[key] = entry => this.asyncScriptLoaderHandleLoad(entry); | ||
| SCRIPT_MAP[scriptURL] = { | ||
|
|
@@ -122,19 +141,6 @@ export default function makeAsyncScript(Component, getScriptURL, options) { | |
| } | ||
| }; | ||
|
|
||
| document.body.appendChild(script); | ||
| } | ||
|
|
||
|
|
@@ -163,22 +169,16 @@ export default function makeAsyncScript(Component, getScriptURL, options) { | |
|
|
||
| render() { | ||
| const globalName = options.globalName; | ||
| // remove asyncScriptOnLoad from childProps | ||
| let { asyncScriptOnLoad, ...childProps } = this.props; // eslint-disable-line no-unused-vars | ||
| if (globalName && typeof window !== "undefined") { | ||
| childProps[globalName] = | ||
| typeof window[globalName] !== "undefined" | ||
| ? window[globalName] | ||
| : undefined; | ||
| } | ||
| childProps.ref = this.assignChildComponent; | ||
| return createElement(WrappedComponent, childProps); | ||
| } | ||
| } | ||
| AsyncScriptLoader.displayName = `AsyncScriptLoader(${wrappedComponentName})`; | ||
|
|
@@ -195,3 +195,4 @@ export default function makeAsyncScript(Component, getScriptURL, options) { | |
| } | ||
| return AsyncScriptLoader; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh wow that was an old example X) Didn't realize I never update it to classes.