Skip to content
This repository has been archived by the owner on May 2, 2022. It is now read-only.

Commit

Permalink
Merged in feature/MZ-38-message-component-incorrect-position (pull re…
Browse files Browse the repository at this point in the history
…quest #13)

Add position for message component
  • Loading branch information
Adarsh Lilha authored and UD-UD committed Sep 11, 2019
2 parents b4c90d4 + 5fbcd66 commit 8a32d7e
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 62 deletions.
2 changes: 1 addition & 1 deletion dist/muze.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/muze.js.map

Large diffs are not rendered by default.

75 changes: 22 additions & 53 deletions examples/js/aa.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
const DataModel = window.muze.DataModel;

d3.json('/data/cars.json', (data) => {
let jsonData = data,
schema = [{
const schema = [{
name: 'Name',
type: 'dimension'
}, {
Expand Down Expand Up @@ -39,57 +38,27 @@
// subtype: 'temporal',
// format: '%Y-%m-%d'
}];
const dm = new DataModel(jsonData, schema);
const canvas = env.canvas();

canvas
.data(dm)
.width(600)
.height(700)
.rows(['Weight_in_lbs'])
.columns(['Name'])
// .detail(['Name'])
.mount('#chart') /* Attaching the canvas to DOM element */
.layers([
{
mark: 'bar'
}
])
.config({
sort: {
Name: 'asc'
}
})

setTimeout(() => {
canvas.config(
{ sort: { Weight_in_lbs: 'desc' }},
{ reset: true },
)
}, 2000);


setTimeout(() => {
canvas.config({
sort: {
Name: 'asc'
},
legend: { show: true }
}, { reset: true })
}, 4000);
let rootData = new DataModel(data, schema)

setTimeout(() => {
canvas.config(
{ sort: { }},
{ reset: true },
)
}, 6000);
rootData.sort([
['Cylinders', 'asc'],
['Maker', 'desc'],
])

setTimeout(() => {
canvas.config(
{ sort: { Weight_in_lbs: 'asc' }},
{ reset: true },
)
}, 8000);
});
}());
const canvas = env.canvas();

canvas
.data(rootData)
.columns(['Cylinders', 'Horsepower'])
.rows(['Acceleration'])
.color('Maker')
.mount('#chart')
.height(500)
.title('Charts');

setTimeout(() => {
canvas.data(canvas.data().select(() => false))
}, 1000);
})
})();
2 changes: 1 addition & 1 deletion packages/muze/npm/dist/muze.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/muze/npm/dist/muze.js.map

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions packages/muze/src/canvas/component-wrapper-maker.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,11 @@ const createHeaderWrapper = (headerType, layoutManager, renderDetails) => {
const createMessageWrapper = (layoutManager, canvas, renderDetails, renderGrid) => {
const headerValues = Object.values(renderDetails.components.headers);
let sum = 0;
let messageWrapper = null;

for (const val of headerValues) {
sum += val.logicalSpace().height;
}
let messageWrapper = null;

if (!renderGrid) {
const defaultDimensions = { height: canvas.height() - sum, width: canvas.width() };
Expand All @@ -131,7 +132,8 @@ const createMessageWrapper = (layoutManager, canvas, renderDetails, renderGrid)
...target,
dimensions: { height, width },
message: NO_DATA_MESSAGE,
classPrefix: MESSAGE_CONFIG
classPrefix: MESSAGE_CONFIG,
position: TOP
};
const wrapperParams = {
name: MESSAGE,
Expand All @@ -141,8 +143,7 @@ const createMessageWrapper = (layoutManager, canvas, renderDetails, renderGrid)
const existingComponent = layoutManager.getComponent(MESSAGE);

if (existingComponent) {
messageWrapper = existingComponent
.updateWrapper(wrapperParams);
messageWrapper = existingComponent.updateWrapper(wrapperParams);
} else {
messageWrapper = new MessageComponent(wrapperParams);
}
Expand Down
3 changes: 2 additions & 1 deletion packages/muze/src/canvas/components/message-component.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ export default class MessageComponent extends MuzeComponent {
}

setParams (params) {
const { target, className } = params.config;
this.component = params.component;
this.params = params;
const { target, className } = params.config;
this.target(target);
this.className(className);
this.position(params.config.position);
return this;
}
}

0 comments on commit 8a32d7e

Please sign in to comment.