Skip to content

Commit

Permalink
refactor(slider): rename customFormatter prop to formatter prop (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
mlmoravek authored Aug 8, 2024
1 parent 9bcc478 commit e0635f8
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion packages/oruga/src/components/slider/Slider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const props = withDefaults(defineProps<SelectProps<IsRange>>(), {
rounded: () => getOption("slider.rounded", false),
disabled: false,
lazy: false,
customFormatter: undefined,
formatter: undefined,
biggerSliderFocus: false,
indicator: false,
format: () => getOption("slider.format", "raw"),
Expand Down
4 changes: 2 additions & 2 deletions packages/oruga/src/components/slider/SliderThumb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ const currentPosition = computed(
const wrapperStyle = computed(() => ({ left: currentPosition.value }));
const formattedValue = computed(() => {
if (typeof slider.value.customFormatter !== "undefined")
return slider.value.customFormatter(props.modelValue);
if (typeof slider.value.formatter !== "undefined")
return slider.value.formatter(props.modelValue);
if (slider.value.format === "percent")
return new Intl.NumberFormat(slider.value.locale, {
Expand Down
4 changes: 1 addition & 3 deletions packages/oruga/src/components/slider/examples/base.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ const sliderType = computed(() => {
</o-field>

<o-field label="Custom tooltip label">
<o-slider
:model-value="30"
:custom-formatter="(val) => val + '%'" />
<o-slider :model-value="30" :formatter="(val) => val + '%'" />
</o-field>

<o-field label="Rounded thumb">
Expand Down
2 changes: 1 addition & 1 deletion packages/oruga/src/components/slider/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export type SelectProps<IsRange extends boolean> = {
/** Update v-model only when dragging is finished */
lazy?: boolean;
/** Function to format the tooltip label for display */
customFormatter?: Function;
formatter?: (value: number) => string;
/** Increases slider size on focus */
biggerSliderFocus?: boolean;
/** Show indicators */
Expand Down
2 changes: 2 additions & 0 deletions packages/oruga/src/components/tabs/Tabs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ function itemHeaderClasses(
@slot Additional slot before tabs
-->
<slot name="start" />

<div
v-for="childItem in items"
v-show="childItem.visible"
Expand Down Expand Up @@ -451,6 +452,7 @@ function itemHeaderClasses(
</span>
</component>
</div>

<!--
@slot Additional slot after tabs
-->
Expand Down

0 comments on commit e0635f8

Please sign in to comment.