@internetarchive/histogram-date-range 1.2.1 → 1.2.2-alpha-webdev7377.1

package/docs/dist/src/histogram-date-range.js

@@ -106,7 +106,7 @@ export let HistogramDateRange = class extends LitElement {
     this.removeListeners();
     super.disconnectedCallback();
   }
-  updated(changedProps) {
+  willUpdate(changedProps) {
     if (changedProps.has("bins") || changedProps.has("minDate") || changedProps.has("maxDate") || changedProps.has("minSelectedDate") || changedProps.has("maxSelectedDate") || changedProps.has("width") || changedProps.has("height")) {
       this.handleDataUpdate();
     }
@@ -123,7 +123,13 @@ export let HistogramDateRange = class extends LitElement {
     this._histData = this.calculateHistData();
     this.minSelectedDate = this.minSelectedDate ? this.minSelectedDate : this.minDate;
     this.maxSelectedDate = this.maxSelectedDate ? this.maxSelectedDate : this.maxDate;
-    this.requestUpdate();
+  }
+  roundToMonth(timestamp) {
+    const date = new Date(timestamp);
+    const [y, m, d] = [date.getFullYear(), date.getMonth(), date.getDate()];
+    if (d < 15)
+      return new Date(y, m, 1).getTime();
+    return new Date(y, m + 1, 1).getTime();
   }
   calculateHistData() {
     const minValue = Math.min(...this.bins);
@@ -132,11 +138,13 @@ export let HistogramDateRange = class extends LitElement {
     const valueScale = this.height / valueRange;
     const dateScale = this.dateRangeMS / this._numBins;
     return this.bins.map((v, i) => {
+      const binStartMS = this.roundToMonth(i * dateScale + this._minDateMS);
+      const binEndMS = this.roundToMonth((i + 1) * dateScale + this._minDateMS);
       return {
         value: v,
         height: Math.floor(Math.log1p(v) * valueScale),
-        binStart: `${this.formatDate(i * dateScale + this._minDateMS)}`,
-        binEnd: `${this.formatDate((i + 1) * dateScale + this._minDateMS)}`
+        binStart: this.formatDate(binStartMS, this.resolvedTooltipDateFormat),
+        binEnd: this.formatDate(binEndMS, this.resolvedTooltipDateFormat)
       };
     });
   }
@@ -155,6 +163,9 @@ export let HistogramDateRange = class extends LitElement {
   get histogramRightEdgeX() {
     return this.width - this.sliderWidth;
   }
+  get resolvedTooltipDateFormat() {
+    return this.tooltipDateFormat ?? this.dateFormat ?? DATE_FORMAT;
+  }
   get loading() {
     return this._isLoading;
   }
@@ -431,7 +442,7 @@ export let HistogramDateRange = class extends LitElement {
       return bar;
     });
   }
-  formatDate(dateMS) {
+  formatDate(dateMS, format = this.dateFormat) {
     if (Number.isNaN(dateMS)) {
       return "";
     }
@@ -439,7 +450,7 @@ export let HistogramDateRange = class extends LitElement {
     if (date.year() < 1e3) {
       return String(date.year());
     }
-    return date.format(this.dateFormat);
+    return date.format(format);
   }
   get minInputTemplate() {
     return html`
@@ -676,6 +687,9 @@ __decorate([
 __decorate([
   property({type: String})
 ], HistogramDateRange.prototype, "dateFormat", 2);
+__decorate([
+  property({type: String})
+], HistogramDateRange.prototype, "tooltipDateFormat", 2);
 __decorate([
   property({type: String})
 ], HistogramDateRange.prototype, "missingDataMessage", 2);
@@ -689,7 +703,7 @@ __decorate([
   property({type: Boolean})
 ], HistogramDateRange.prototype, "disabled", 2);
 __decorate([
-  property({type: Object})
+  property({type: Array})
 ], HistogramDateRange.prototype, "bins", 2);
 __decorate([
   property({type: Boolean})

package/index.ts

@@ -1 +1 @@
-export { HistogramDateRange } from './src/histogram-date-range';
+export { HistogramDateRange } from './src/histogram-date-range';

package/package.json

@@ -1,85 +1,85 @@
-{
-  "name": "@internetarchive/histogram-date-range",
-  "version": "1.2.1",
-  "description": "Internet Archive histogram date range picker",
-  "license": "AGPL-3.0-only",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "start": "tsc && concurrently -k -r \"tsc --watch --preserveWatchOutput\" \"wds\"",
-    "build": "snowpack build && touch docs/.nojekyll",
-    "prepublish": "tsc",
-    "prepare": "npm run build",
-    "lint": "eslint --ext .ts,.html . --ignore-path .gitignore && prettier \"**/*.ts\" --check --ignore-path .gitignore",
-    "format": "eslint --ext .ts,.html . --fix --ignore-path .gitignore && prettier \"**/*.ts\" --write --ignore-path .gitignore",
-    "test": "tsc && wtr --coverage",
-    "test:watch": "tsc && concurrently -k -r \"tsc --watch --preserveWatchOutput\" \"wtr --watch\""
-  },
-  "dependencies": {
-    "@internetarchive/ia-activity-indicator": "^0.0.6",
-    "dayjs": "^1.11.13",
-    "lit": "^2.8.0"
-  },
-  "devDependencies": {
-    "@open-wc/eslint-config": "^7.0.0",
-    "@open-wc/testing": "^3.0.3",
-    "@types/mocha": "^10.0.10",
-    "@typescript-eslint/eslint-plugin": "^5.10.0",
-    "@typescript-eslint/parser": "^5.10.0",
-    "@web/dev-server": "^0.1.29",
-    "@web/test-runner": "^0.19.0",
-    "concurrently": "^7.0.0",
-    "eslint": "^8.7.0",
-    "eslint-config-prettier": "^8.3.0",
-    "husky": "^4.3.8",
-    "lint-staged": "^12.2.2",
-    "lit-html": "^2.1.1",
-    "prettier": "^2.5.1",
-    "snowpack": "^3.8.8",
-    "tslib": "^2.3.1",
-    "typescript": "^4.5"
-  },
-  "eslintConfig": {
-    "parser": "@typescript-eslint/parser",
-    "extends": [
-      "@open-wc/eslint-config",
-      "eslint-config-prettier"
-    ],
-    "plugins": [
-      "@typescript-eslint"
-    ],
-    "rules": {
-      "no-unused-vars": "off",
-      "@typescript-eslint/no-unused-vars": [
-        "error"
-      ],
-      "import/no-unresolved": "off",
-      "import/extensions": [
-        "error",
-        "always",
-        {
-          "ignorePackages": true
-        }
-      ]
-    }
-  },
-  "prettier": {
-    "singleQuote": true,
-    "arrowParens": "avoid"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.ts": [
-      "eslint --fix",
-      "prettier --write"
-    ]
-  }
-}
+{
+  "name": "@internetarchive/histogram-date-range",
+  "version": "1.2.2-alpha-webdev7377.1",
+  "description": "Internet Archive histogram date range picker",
+  "license": "AGPL-3.0-only",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "start": "tsc && concurrently -k -r \"tsc --watch --preserveWatchOutput\" \"wds\"",
+    "build": "snowpack build && touch docs/.nojekyll",
+    "prepublish": "tsc",
+    "prepare": "npm run build",
+    "lint": "eslint --ext .ts,.html . --ignore-path .gitignore && prettier \"**/*.ts\" --check --ignore-path .gitignore",
+    "format": "eslint --ext .ts,.html . --fix --ignore-path .gitignore && prettier \"**/*.ts\" --write --ignore-path .gitignore",
+    "test": "tsc && wtr --coverage",
+    "test:watch": "tsc && concurrently -k -r \"tsc --watch --preserveWatchOutput\" \"wtr --watch\""
+  },
+  "dependencies": {
+    "@internetarchive/ia-activity-indicator": "^0.0.6",
+    "dayjs": "^1.11.13",
+    "lit": "^2.8.0"
+  },
+  "devDependencies": {
+    "@open-wc/eslint-config": "^7.0.0",
+    "@open-wc/testing": "^3.0.3",
+    "@types/mocha": "^10.0.10",
+    "@typescript-eslint/eslint-plugin": "^5.10.0",
+    "@typescript-eslint/parser": "^5.10.0",
+    "@web/dev-server": "^0.1.29",
+    "@web/test-runner": "^0.19.0",
+    "concurrently": "^7.0.0",
+    "eslint": "^8.7.0",
+    "eslint-config-prettier": "^8.3.0",
+    "husky": "^4.3.8",
+    "lint-staged": "^12.2.2",
+    "lit-html": "^2.1.1",
+    "prettier": "^2.5.1",
+    "snowpack": "^3.8.8",
+    "tslib": "^2.3.1",
+    "typescript": "^4.5"
+  },
+  "eslintConfig": {
+    "parser": "@typescript-eslint/parser",
+    "extends": [
+      "@open-wc/eslint-config",
+      "eslint-config-prettier"
+    ],
+    "plugins": [
+      "@typescript-eslint"
+    ],
+    "rules": {
+      "no-unused-vars": "off",
+      "@typescript-eslint/no-unused-vars": [
+        "error"
+      ],
+      "import/no-unresolved": "off",
+      "import/extensions": [
+        "error",
+        "always",
+        {
+          "ignorePackages": true
+        }
+      ]
+    }
+  },
+  "prettier": {
+    "singleQuote": true,
+    "arrowParens": "avoid"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.ts": [
+      "eslint --fix",
+      "prettier --write"
+    ]
+  }
+}

package/snowpack.config.js

@@ -1,10 +1,10 @@
-module.exports = {
-  buildOptions: {
-    out: 'docs',
-  },
-  mount: {
-    'demo/js': { url: '/dist/demo/js' },
-    demo: { url: '/demo' },
-    src: { url: '/dist/src' },
-  },
-};
+module.exports = {
+  buildOptions: {
+    out: 'docs',
+  },
+  mount: {
+    'demo/js': { url: '/dist/demo/js' },
+    demo: { url: '/demo' },
+    src: { url: '/dist/src' },
+  },
+};