Skip to content

Commit

Permalink
chore: format
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanomackey committed Aug 5, 2020
1 parent 20ec19a commit af4f9e5
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 51 deletions.
8 changes: 2 additions & 6 deletions packages/core/CHANGELOG.md
@@ -1,16 +1,12 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
All notable changes to this project will be documented in this file. See
[Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.34.8](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.7...v0.34.8) (2020-07-30)

**Note:** Version bump only for package @carbon/charts





# Change Log

All notable changes to this project will be documented in this file. See
Expand Down
4 changes: 2 additions & 2 deletions packages/core/demo/data/pie.ts
Expand Up @@ -50,8 +50,8 @@ export const pieErrorOptions = {
data: {
loading: false,
error: {
title: 'No data available',
subtitle: 'Lorem ipsum dolor sit.'
title: "No data available",
subtitle: "Lorem ipsum dolor sit."
}
}
};
105 changes: 68 additions & 37 deletions packages/core/src/components/graphs/skeleton.ts
Expand Up @@ -28,7 +28,11 @@ export class Skeleton extends Component {
"data",
"loading"
);
const error = Tools.getProperty(this.model.getOptions(), 'data', 'error');
const error = Tools.getProperty(
this.model.getOptions(),
"data",
"error"
);

// display a skeleton if there is no chart data or the loading flag is set to true
if (isDataLoading) {
Expand Down Expand Up @@ -314,82 +318,109 @@ export class Skeleton extends Component {
}

renderErrorMesssage(error) {
const skeleton = this.parent.select('.chart-skeleton')
const skeleton = this.parent.select(".chart-skeleton");
const height = skeleton.attr("height");
const width = skeleton.attr("width");

const errorContainer = DOMUtils.appendOrSelect(skeleton, "svg.bx--cc--error-message")
.attr('width', width)
.attr('height', height)
const errorContainer = DOMUtils.appendOrSelect(
skeleton,
"svg.bx--cc--error-message"
)
.attr("width", width)
.attr("height", height);

// Error icon
const errorIcon = errorContainer.selectAll("circle.bx--cc--error-message__icon")
.data([{
cx: '1em',
cy: (height / 2) - 5,
r: '.625em'
}]);

errorIcon.enter()
.append('circle')
.classed('bx--cc--error-message__icon', true)
const errorIcon = errorContainer
.selectAll("circle.bx--cc--error-message__icon")
.data([
{
cx: "1em",
cy: height / 2 - 5,
r: ".625em"
}
]);

errorIcon
.enter()
.append("circle")
.classed("bx--cc--error-message__icon", true)
.merge(errorIcon)
.attr('cx', d => d.cx)
.attr('cy', d => d.cy)
.attr('r', d => d.r)
.attr("cx", (d) => d.cx)
.attr("cy", (d) => d.cy)
.attr("r", (d) => d.r);

DOMUtils.appendOrSelect(errorContainer, 'circle.bx--cc--error-message__icon')
DOMUtils.appendOrSelect(
errorContainer,
"circle.bx--cc--error-message__icon"
);

errorIcon.exit().remove();

// Exclamation point

const exclamationPoint = errorContainer.selectAll('text.bx--cc--error-message__exclamation-point').data(['!'])
const exclamationPoint = errorContainer
.selectAll("text.bx--cc--error-message__exclamation-point")
.data(["!"]);

exclamationPoint.enter()
.append('text')
.classed('bx--cc--error-message__exclamation-point', true)
exclamationPoint
.enter()
.append("text")
.classed("bx--cc--error-message__exclamation-point", true)
.merge(exclamationPoint)
.attr("x", '.75em')
.attr('y', (height / 2) + 1)
.html(d => d)
.attr("x", ".75em")
.attr("y", height / 2 + 1)
.html((d) => d);

DOMUtils.appendOrSelect(errorContainer, 'text.bx--cc--error-message__exclamation-point')
DOMUtils.appendOrSelect(
errorContainer,
"text.bx--cc--error-message__exclamation-point"
);

exclamationPoint.exit().remove();

// Title
const errorTitle = errorContainer.selectAll("text.bx--cc--error-message__title").data([error.title]);
const errorTitle = errorContainer
.selectAll("text.bx--cc--error-message__title")
.data([error.title]);

errorTitle.enter()
errorTitle
.enter()
.append("text")
.classed("bx--cc--error-message__title", true)
.merge(errorTitle)
.attr("x", "2.25em")
.attr("y", height / 2)
.html(d => d);
.html((d) => d);

DOMUtils.appendOrSelect(errorContainer, "text.bx--cc--error-message__title");
DOMUtils.appendOrSelect(
errorContainer,
"text.bx--cc--error-message__title"
);

errorTitle.exit().remove();

// Subtitle
const errorSubtitle = errorContainer.selectAll("text.bx--cc--error-message__subtitle").data([error.subtitle]);
const errorSubtitle = errorContainer
.selectAll("text.bx--cc--error-message__subtitle")
.data([error.subtitle]);

errorSubtitle.enter()
errorSubtitle
.enter()
.append("text")
.classed("bx--cc--error-message__subtitle", true)
.merge(errorSubtitle)
.attr("x", "2.65em")
.attr("y", (height / 2) + 18)
.html(d => d);
.attr("y", height / 2 + 18)
.html((d) => d);

DOMUtils.appendOrSelect(errorContainer, "text.bx--cc--error-message__subtitle");
DOMUtils.appendOrSelect(
errorContainer,
"text.bx--cc--error-message__subtitle"
);

errorSubtitle.exit().remove();
}


removeErrorMessage() {
const container = this.parent.select(".bx--cc--error-message");
container.remove();
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/styles/components/_error-message.scss
Expand Up @@ -9,10 +9,10 @@ svg.#{$prefix}--#{$charts-prefix}--error-message {
}

text.#{$prefix}--#{$charts-prefix}--error-message__title {
@include carbon--type-style('productive-heading-01');
@include carbon--type-style("productive-heading-01");
}

text.#{$prefix}--#{$charts-prefix}--error-message__subtitle {
@include carbon--type-style('helper-text-01');
@include carbon--type-style("helper-text-01");
}
}
4 changes: 0 additions & 4 deletions packages/vue/CHANGELOG.md
Expand Up @@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

**Note:** Version bump only for package @carbon/charts-vue





## [0.34.7](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.6...v0.34.7) (2020-07-29)

**Note:** Version bump only for package @carbon/charts-vue
Expand Down

0 comments on commit af4f9e5

Please sign in to comment.