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

Segregate Labels #24

Merged
merged 6 commits into from
Jun 1, 2020
Merged

Segregate Labels #24

merged 6 commits into from
Jun 1, 2020

Conversation

zombiesplat
Copy link
Contributor

This fixes the problem where labels are automatically used.

in order to use labels, you must pass in an Array[] of strings that correlate to the bars data

the prop is label-data

          <bars
            v-if="data"
            class="minimal-bars"
            :data="data"
            :label-data="labels"
            :barWidth="10"
            auto-draw
            smooth
            :gradient="gradient"
            :width="120"
            :height="56"
            :padding="1"
            :min-bar-height="minBarHeight"
            :label-rotate="labelRotate"
            :label-color="labelColor"
          ></bars>

    props: {
      dark: Boolean,
      reverse: Boolean,
      data: Array,
      icon: String,
      title: String,
      subTitle: String,
      color: String,
      applyTitleColor: Boolean,
      gradient: Array,
      minBarHeight: Number,
      labelRotate: Number,
      labelColor: String,
      labels: Array,
    },

Alan Asher added 4 commits July 21, 2019 14:02
Adding ability for negative numbers
Adding a minimum bar height to avoid ugly math when
the value is zero
@zombiesplat
Copy link
Contributor Author

so it looks like I have some merge conflicts because I didn't start with the latest branch. I'm trying to figure out how to get my fork updated, but patching doesn't seem to help. I'll look at this soon as I can, but if you can suss out the problem without me, let me know.

@zombiesplat
Copy link
Contributor Author

I figured it out. set upstream and then merge locally. so I did that and made sure the labelSize changes got ported to my changes as well.

hopefully this is all good. sorry it took a while to get to it.

Copy link
Owner

@DeviaVir DeviaVir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 looks good, sorry for the delay on getting this in

@DeviaVir DeviaVir merged commit f7e332c into DeviaVir:master Jun 1, 2020
@smknstd
Copy link
Collaborator

smknstd commented Jun 1, 2020

@DeviaVir As said by @zombiesplat here, this PR introduced breaking changes. Did you plan to create a new major version number ?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants