Skip to content

Replace vue event bus with mitt.js #115

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace vue event bus with mitt.js #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7,803 changes: 7,649 additions & 154 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"license": "MIT",
"dependencies": {
"ajv": "^6.12.6",
"lodash": "^4.17.20"
"lodash": "^4.17.20",
"mitt": "^3.0.0"
},
"devDependencies": {
"@babel/core": "^7.2.2",
Expand Down
2 changes: 1 addition & 1 deletion src/vfjs-field-mixin/methods/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const helpers = {
});

if (!initialBlur) {
this.vfjsBus.$emit(VFJS_EVENT_UI_FIELDS_UPDATE);
this.vfjsBus.emit(VFJS_EVENT_UI_FIELDS_UPDATE);
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/vfjs-field-mixin/methods/setters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ const setters = {
this.setVfjsFieldModel(value);
},
setVfjsFieldState(value, key) {
this.vfjsBus.$emit(VFJS_EVENT_FIELD_STATE_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_FIELD_STATE_UPDATE, {
key: key || this.vfjsFieldModelKey,
value,
});
},
setVfjsFieldModel(value, key) {
this.vfjsBus.$emit(VFJS_EVENT_FIELD_MODEL_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_FIELD_MODEL_UPDATE, {
key: key || this.vfjsFieldModelKey,
value,
});
Expand Down
14 changes: 7 additions & 7 deletions src/vfjs-global-mixin/methods/vfjs-bus/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const vfjsBusEventActions = {
const vfjsFieldModel = get(vfjsModel, key);

return new Promise((resolve) => {
this.vfjsBus.$emit(VFJS_EVENT_FIELD_MODEL_VALIDATE, {
this.vfjsBus.emit(VFJS_EVENT_FIELD_MODEL_VALIDATE, {
value: vfjsFieldModel,
key,
cb: (errors) => {
Expand Down Expand Up @@ -108,7 +108,7 @@ const vfjsBusEventActions = {

const vfjsModel = this.vfjsHelperApplyFieldModel(key, value);

this.vfjsBus.$emit(VFJS_EVENT_MODEL_VALIDATE, {
this.vfjsBus.emit(VFJS_EVENT_MODEL_VALIDATE, {
vfjsModel,
cb: (newVfjsState) => {
const vfjsFieldModel = this.getVfjsFieldModel(key);
Expand All @@ -118,7 +118,7 @@ const vfjsBusEventActions = {

const vfjsFieldState = get(newVfjsState, `${key}`);
const { vfjsFieldErrors = [] } = vfjsFieldState;
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATE, {
value: newVfjsState,
cb: () => {
if (
Expand All @@ -139,13 +139,13 @@ const vfjsBusEventActions = {
[VFJS_EVENT_FIELD_STATE_UPDATE]({ key, value, cb }) {
const newVfjsState = { ...this.getVfjsState(), [key]: value };

this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATE, {
value: newVfjsState,
cb,
});
},
[VFJS_EVENT_MODEL_VALIDATE]({ vfjsModel, cb }) {
this.vfjsBus.$emit(VFJS_EVENT_FIELD_MODELS_VALIDATE, {
this.vfjsBus.emit(VFJS_EVENT_FIELD_MODELS_VALIDATE, {
vfjsModel,
cb: (vfjsFieldStates) => {
const vfjsErrors = this.getVfjsValidationErrors(vfjsModel);
Expand Down Expand Up @@ -187,10 +187,10 @@ const vfjsBusEventActions = {
this.setVfjsUiFieldsActive();
},
[VFJS_EVENT_MODEL_UPDATED]() {
this.vfjsBus.$emit(VFJS_EVENT_UI_FIELDS_UPDATE);
this.vfjsBus.emit(VFJS_EVENT_UI_FIELDS_UPDATE);

// Clear hidden fields
this.vfjsBus.$emit(VFJS_EVENT_FIELD_MODEL_CLEAR_HIDDEN);
this.vfjsBus.emit(VFJS_EVENT_FIELD_MODEL_CLEAR_HIDDEN);

this.$emit(VFJS_EXTERNAL_EVENT_CHANGE, this.getVfjsModel());
},
Expand Down
10 changes: 5 additions & 5 deletions src/vfjs-global-mixin/methods/vfjs-bus/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import Vue from 'vue';
import mitt from 'mitt';
import vfjsBusEventActions from './actions';

const vfjsBus = {
addVfjsListener(event, callback) {
this.vfjsBus.$on(event, (value) => callback(event, value));
this.vfjsBus.on(event, (value) => callback(event, value));
},
addVfjsListeners(events = [], callback) {
events.forEach((event) => this.addVfjsListener(event, callback));
},
removeVfjsListener(event) {
this.vfjsBus.$off(event);
this.vfjsBus.off(event);
},
removeVfjsListeners(events = []) {
events.forEach(this.removeVfjsListener);
},
removeVfjsListenersAll() {
this.vfjsBus.$off();
this.vfjsBus.off();
},
vfjsBusInitialize() {
this.vfjsBus = new Vue();
this.vfjsBus = mitt();
},
vfjsBusEventHandler(event, payload) {
if (event && event in vfjsBusEventActions) {
Expand Down
6 changes: 3 additions & 3 deletions src/vfjs-global-mixin/methods/vfjs-lifecycle/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ const vfjsLifecycle = {
if (this.vfjsOptions.validate && this.vfjsOptions.validateOnLoad) {
const vfjsModel = this.getVfjsModel();

this.vfjsBus.$emit(VFJS_EVENT_MODEL_VALIDATE, {
this.vfjsBus.emit(VFJS_EVENT_MODEL_VALIDATE, {
vfjsModel,
cb: (vfjsState) => {
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATE, {
value: vfjsState,
cb: () => {
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATED, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATED, {
cb: () => {
// Set up ui schema
this.setVfjsUiSchema(this.uiSchema);
Expand Down
10 changes: 5 additions & 5 deletions src/vfjs-global-mixin/methods/vfjs-model/setters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {

const vfjsModelSetters = {
setVfjsFieldModel(value, key) {
this.vfjsBus.$emit(VFJS_EVENT_FIELD_MODEL_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_FIELD_MODEL_UPDATE, {
key: key || this.vfjsFieldModelKey,
value,
});
Expand All @@ -19,15 +19,15 @@ const vfjsModelSetters = {
this.vfjsModel = cloneDeep(model);

if (!silent) {
this.vfjsBus.$emit(VFJS_EVENT_MODEL_VALIDATE, {
this.vfjsBus.emit(VFJS_EVENT_MODEL_VALIDATE, {
vfjsModel: this.vfjsModel,
cb: (newVfjsState) => {
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATE, {
value: newVfjsState,
cb: () => {
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATED, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATED, {
cb: () => {
this.vfjsBus.$emit(VFJS_EVENT_MODEL_UPDATED);
this.vfjsBus.emit(VFJS_EVENT_MODEL_UPDATED);
},
});
},
Expand Down
8 changes: 4 additions & 4 deletions src/vfjs-global-mixin/methods/vfjs-schema/setters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ const vfjsSchemaSetters = {
if (this.vfjsOptions.validate) {
const vfjsModel = this.getVfjsModel();

this.vfjsBus.$emit(VFJS_EVENT_MODEL_VALIDATE, {
this.vfjsBus.emit(VFJS_EVENT_MODEL_VALIDATE, {
vfjsModel,
cb: (vfjsState) => {
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATE, {
value: vfjsState,
cb: () => {
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATED, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATED, {
cb: () => {
this.setVfjsFields();
},
Expand All @@ -30,7 +30,7 @@ const vfjsSchemaSetters = {
},
});
} else {
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATED, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATED, {
cb: () => {
this.setVfjsFields();
},
Expand Down
4 changes: 2 additions & 2 deletions src/vfjs-global-mixin/methods/vfjs-state/setters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import {

const vfjsStateSetters = {
setVfjsFieldState(value, key) {
this.vfjsBus.$emit(VFJS_EVENT_FIELD_STATE_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_FIELD_STATE_UPDATE, {
key: key || this.vfjsFieldModelKey,
value,
});
},
setVfjsState(state) {
if (!isEqual(state, this.getVfjsState())) {
this.vfjsState = Object.assign({}, this.getVfjsState(), state);
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATED, {});
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATED, {});
}
},
};
Expand Down
8 changes: 4 additions & 4 deletions src/vfjs-global-mixin/methods/vfjs-ui/setters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ const vfjsUiSetters = {
if (this.vfjsOptions.validate) {
const vfjsModel = this.getVfjsModel();

this.vfjsBus.$emit(VFJS_EVENT_MODEL_VALIDATE, {
this.vfjsBus.emit(VFJS_EVENT_MODEL_VALIDATE, {
vfjsModel,
cb: (vfjsState) => {
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATE, {
value: vfjsState,
cb: () => {
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATED, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATED, {
cb: () => {
this.setVfjsFields();
},
Expand All @@ -40,7 +40,7 @@ const vfjsUiSetters = {
},
});
} else {
this.vfjsBus.$emit(VFJS_EVENT_STATE_UPDATED, {
this.vfjsBus.emit(VFJS_EVENT_STATE_UPDATED, {
cb: () => {
this.setVfjsFields();
},
Expand Down
8 changes: 4 additions & 4 deletions src/vfjs-global-mixin/methods/vfjs-validation/setters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ import {

const vfjsValidationSetters = {
setVfjsValidationErrors() {
this.vfjsBus.$emit(VFJS_EVENT_MODEL_VALIDATE, {
this.vfjsBus.emit(VFJS_EVENT_MODEL_VALIDATE, {
vfjsModel: this.getVfjsModel(),
cb: () => {
const validateRequired = key => new Promise((resolve, reject) => {
this.vfjsBus.$emit(VFJS_EVENT_FIELD_MODEL_VALIDATE, {
this.vfjsBus.emit(VFJS_EVENT_FIELD_MODEL_VALIDATE, {
key,
value: this.getVfjsFieldModel(key),
cb: (vfjsFieldErrors) => {
const fieldState = this.getVfjsFieldState(key);
this.vfjsBus.$emit(VFJS_EVENT_FIELD_STATE_UPDATE, {
this.vfjsBus.emit(VFJS_EVENT_FIELD_STATE_UPDATE, {
key,
value: {
...fieldState,
Expand All @@ -31,7 +31,7 @@ const vfjsValidationSetters = {
});

const operations = this.vfjsFieldsRequired.map(validateRequired);
return Promise.all(operations).then(() => this.vfjsBus.$emit(VFJS_EVENT_UI_FIELDS_UPDATE));
return Promise.all(operations).then(() => this.vfjsBus.emit(VFJS_EVENT_UI_FIELDS_UPDATE));
},
});
},
Expand Down