ag-common 0.0.656 → 0.0.657

package/dist/ui/components/LineChart/Base.js

@@ -101,8 +101,14 @@ const LineChart = (p) => {
         } }, points.map((p2) => {
         var _a, _b, _c;
         return (react_1.default.createElement(react_1.default.Fragment, { key: JSON.stringify(p2) },
+            //mouse selected
             (p2.origX === ((_c = (_b = (_a = UT.pos) === null || _a === void 0 ? void 0 : _a.data.selectedXs) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.x) ||
-                p2.x1 === p2.x2) && (react_1.default.createElement("circle", { cx: `${p2.x2}%`, cy: `${p2.y2}%`, r: "8px", fill: p.colours[p2.name] })),
+                //only single date point
+                p2.x1 === p2.x2 ||
+                //is the last point
+                p2.isLast) && (react_1.default.createElement("circle", Object.assign({ cx: `${p2.x2}%`, cy: `${p2.y2}%`, r: "8px", style: { zIndex: 1 } }, (p2.isToday && p2.isLast
+                ? { stroke: p.colours[p2.name], fill: 'transparent' }
+                : { fill: p.colours[p2.name] })))),
             p2.x1 !== p2.x2 && (react_1.default.createElement("line", { strokeOpacity: legendItems.part.find((f) => f.name === p2.name) ? 1 : 0.3, x1: `${p2.x1}%`, x2: `${p2.x2}%`, y1: `${p2.y1}%`, y2: `${p2.y2}%`, style: Object.assign({ stroke: p.colours[p2.name] }, (p2.isToday && {
                     strokeDasharray: 10,
                     animation: 'dash 50s linear reverse infinite',

package/dist/ui/components/LineChart/LegendX.js

@@ -7,6 +7,7 @@ exports.LegendX = void 0;
 const styled_1 = __importDefault(require("@emotion/styled"));
 const react_1 = __importDefault(require("react"));
 const common_1 = require("../../../common");
+const styles_1 = require("../../styles");
 const getLegendItems_1 = require("./getLegendItems");
 const Base = styled_1.default.div `
   display: flex;
@@ -33,6 +34,13 @@ const Numbers = styled_1.default.div `
   flex-flow: row;
   justify-content: space-between;
   z-index: 1;
+
+  @media ${styles_1.smallScreen} {
+    [data-group='1'],
+    [data-group='2'] {
+      display: none;
+    }
+  }
 `;
 const Items = styled_1.default.div `
   width: 100%;
@@ -73,23 +81,23 @@ const LegendX = ({ data, lt, tt, colours, style, }) => {
     const minX = Math.min(...xs);
     const maxX = Math.max(...xs);
     const maxY = Math.max(...ys);
-    const itemsRaw = [minX];
+    const itemsRaw = [{ v: minX, group: 0 }];
     const gc = 8;
     const gap = (maxX - minX) / gc;
     if (gap > common_1.twelveHMs) {
         for (let a = 1; a < gc; a += 1) {
-            itemsRaw.push(itemsRaw[a - 1] + gap);
+            itemsRaw.push({ v: itemsRaw[a - 1].v + gap, group: (a % 3) + 1 });
         }
     }
-    itemsRaw.push(maxX);
-    const items = itemsRaw.map((d) => { var _a; return (_a = lt(d)) !== null && _a !== void 0 ? _a : d; });
+    itemsRaw.push({ v: maxX, group: 0 });
+    const items = itemsRaw.map((d) => { var _a; return ({ v: (_a = lt(d.v)) !== null && _a !== void 0 ? _a : d.v, group: d.group }); });
     const ch = maxY.toString().length + 1;
     return (react_1.default.createElement(Base, { style: Object.assign(Object.assign({}, style), { marginLeft: 'auto', width: `calc(100% - ${ch}ch)` }) },
         react_1.default.createElement(Bar, null,
             react_1.default.createElement(Line, { style: { backgroundColor: style.color } }),
             react_1.default.createElement(Numbers, null, items.map((i, i2) => (react_1.default.createElement("span", { 
                 // eslint-disable-next-line react/no-array-index-key
-                key: i + i2, style: { backgroundColor: style.backgroundColor } }, i))))),
+                key: i.v + i2, "data-group": i.group, style: { backgroundColor: style.backgroundColor } }, i.v))))),
         legendItems.length > 1 && (react_1.default.createElement(Items, null, legendItems.map((k) => (react_1.default.createElement(Item, { key: k.name },
             react_1.default.createElement(Col, { style: { backgroundColor: k.colour } }),
             k.name)))))));

package/dist/ui/components/LineChart/interpolate.d.ts

@@ -8,6 +8,7 @@ interface ILineChartItemComp {
     origX: number;
     origY: number;
     isToday: boolean;
+    isLast: boolean;
 }
 export declare const interpolate: (raw: ILineChartItemRaw[]) => {
     points: ILineChartItemComp[];

package/dist/ui/components/LineChart/interpolate.js

@@ -48,6 +48,7 @@ const interpolate = (raw) => {
                 origX: p.x,
                 origY: p.y,
                 isToday: (0, dateHelpers_1.isToday)(p.x),
+                isLast: i === items.length - 1,
             };
         });
         points.push(...(0, common_1.distinctBy)(p, (s) => JSON.stringify(s)));

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.656",
+  "version": "0.0.657",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",