Skip to content

Commit

Permalink
Merge pull request #84 from Esri/FitlerList-coded-values
Browse files Browse the repository at this point in the history
coded values bug fix, add translations
  • Loading branch information
rslibed authored Jun 6, 2022
2 parents 4b8f74d + 7eb74fc commit 1df46b7
Show file tree
Hide file tree
Showing 48 changed files with 269 additions and 63 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 1.6.1
- FilterList
1. coded values bug fix
2. Add translations

## 1.6.0
- Screenshot
1. RTL Fixes
Expand Down
8 changes: 3 additions & 5 deletions FilterList/FilterList.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion FilterList/FilterList.js.map

Large diffs are not rendered by default.

12 changes: 5 additions & 7 deletions FilterList/FilterList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ class FilterList extends Widget {
);
}

// HARDCODED IN EN
private _renderDatePicker(layerId: string, expression: Expression) {
return (
<label class={CSS.filterItem.userInput}>
Expand All @@ -282,16 +281,16 @@ class FilterList extends Widget {
min={expression?.min}
max={expression?.max}
locale={this._locale ?? "en"}
next-month-label="Next month"
prev-month-label="Previous month"
next-month-label={i18n.nextMonth}
prev-month-label={i18n.previousMonth}
range
layout="vertical"
theme={this.theme}
></calcite-input-date-picker>
<calcite-action
onclick={this.viewModel.handleResetDatePicker.bind(this.viewModel, expression, layerId)}
icon="reset"
label="Reset date picker"
label={i18n.resetDatePicker}
scale="s"
theme={this.theme}
></calcite-action>
Expand All @@ -300,7 +299,6 @@ class FilterList extends Widget {
);
}

// HARDCODED IN EN
private _renderNumberSlider(layerId: string, expression: Expression) {
return expression?.min && expression?.max ? (
<label key={expression?.definitionExpressionId} class={CSS.filterItem.userInput}>
Expand All @@ -309,8 +307,8 @@ class FilterList extends Widget {
<calcite-slider
id={expression?.definitionExpressionId}
afterCreate={this.viewModel.handleSliderCreate.bind(this.viewModel, expression, layerId)}
min-label={`${expression.field}, lower bound`}
max-label={`${expression.field}, upper bound`}
min-label={i18n.minSlider.replace("{field}",expression.field)}
max-label={i18n.maxSlider.replace("{field}",expression.field)}
step={expression?.step ? expression.step : 1}
label-handles=""
snap=""
Expand Down
12 changes: 8 additions & 4 deletions FilterList/FilterList/FilterListViewModel.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1df46b7

Please sign in to comment.