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.

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

[WIP]fix(jsx2mp): can't get correct prop value from defaultProps #63

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+10 −2
Open

[WIP]fix(jsx2mp): can't get correct prop value from defaultProps #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24c0f1d
fix(jsx2mp): can't get correct prop value from defaultProps
ChrisCindy Dec 14, 2020
0b526b7
Merge branch 'master' into fix/default-props
ChrisCindy Dec 16, 2020
20c494b
Merge branch 'master' into fix/default-props
ChrisCindy Dec 29, 2020
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
5 changes: 3 additions & 2 deletions packages/jsx2mp-runtime/src/bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ function getComponentCycles(Klass) {
});
}
this.instance = new Klass(props);
this.instance.defaultProps = Klass.defaultProps;
this.instance._internal = this;
this.instance.__injectHistory = Klass.__injectHistory;
this.instance.instanceId = instanceId;
Expand Down Expand Up @@ -410,10 +411,10 @@ function toleranceEventTimeStamp(timeStamp) {
return Math.floor(timeStamp / 10) - 5;
}

function generateBaseOptions(internal, defaultProps, ...restProps) {
function generateBaseOptions(internal, ...restProps) {
const instanceId = getId('tag', internal);

const props = Object.assign({}, defaultProps, internal[PROPS], {
const props = Object.assign({}, internal[PROPS], {
TAGID: instanceId,
// In MiniApp every slot is scopedSlots
$slots: {
Expand Down
7 changes: 7 additions & 0 deletions packages/jsx2mp-runtime/src/updater.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ export function updateChildProps(trigger, instanceId, nextUpdateProps) {
targetComponent.props,
nextUpdateProps
);
const defaultProps = targetComponent.defaultProps || {};
// Resolve default props
for (let propName in defaultProps) {
if (nextProps[propName] === undefined) {
nextProps[propName] = defaultProps[propName];
}
}
// Inject history
if (targetComponent.__injectHistory) {
const history = getMiniAppHistory();
Expand Down