Skip to content

Commit be86a32

Browse files
brymon68brymon68
committed
fix to table widths, now computing virtual width based on dom node, not text width
1 parent f7cf679 commit be86a32

9 files changed

+24
-31
lines changed

‎public/asset-manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"main.css": "/static/css/main.23c18382.chunk.css",
3-
"main.js": "/static/js/main.16aea81c.chunk.js",
4-
"main.js.map": "/static/js/main.16aea81c.chunk.js.map",
3+
"main.js": "/static/js/main.18274205.chunk.js",
4+
"main.js.map": "/static/js/main.18274205.chunk.js.map",
55
"runtime~main.js": "/static/js/runtime~main.42ac5946.js",
66
"runtime~main.js.map": "/static/js/runtime~main.42ac5946.js.map",
77
"static/js/2.9e5a29d8.chunk.js": "/static/js/2.9e5a29d8.chunk.js",
88
"static/js/2.9e5a29d8.chunk.js.map": "/static/js/2.9e5a29d8.chunk.js.map",
99
"index.html": "/index.html",
10-
"precache-manifest.e145a3fb9c244648c263d58e265f4402.js": "/precache-manifest.e145a3fb9c244648c263d58e265f4402.js",
10+
"precache-manifest.d41beb2efa7c244743d8d264527b4e15.js": "/precache-manifest.d41beb2efa7c244743d8d264527b4e15.js",
1111
"service-worker.js": "/service-worker.js",
1212
"static/css/main.23c18382.chunk.css.map": "/static/css/main.23c18382.chunk.css.map",
1313
"static/media/scot_logo_473x473.png": "/static/media/scot_logo_473x473.981c5c79.png"

‎public/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-eval' ; style-src 'self' 'unsafe-inline' blob:; frame-src 'self'; "><meta http-equiv="pragma" content="no-cache"/><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content=""><meta name="author" content=""><meta name="referrer" content="no-referrer"><title>SCOT 3.7</title><script type="text/javascript" src="/libs/tinymce/js/tinymce/tinymce.min.js"></script><link rel="stylesheet" href="/css/revl.css"><link rel="manifest" href="/manifest.json"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap.min.css"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap-grid.min.css"><link rel="stylesheet" href="/css/react-table.css"><link rel="stylesheet" href="/css/font-awesome.min.css"><link rel="stylesheet" href="/css/react-calendar.css"><link rel="stylesheet" href="/css/reactTags.css"><link rel="stylesheet" href="/css/jquery.qtip.css"><link rel="stylesheet" href="/css/table-twbs.css"><link rel="stylesheet" href="/css/jquery-ui.css"><link rel="stylesheet" href="/css/codemirror.min.css"><link rel="stylesheet" href="/css/react-datetime.css"><link rel="stylesheet" href="/libs/tablesorter-master/css/theme.default.css"><link rel="stylesheet" href="/css/styles.css"><link rel="stylesheet" href="/css/sandbox.css"><link rel="stylesheet" href="/css/scot.css"><script type="text/javascript" src="/libs/jquery-3.3.1/jquery.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap.min.js"></script><script type="text/javascript" src="/libs/jquery-2.1.1.1-nav.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap-nav.min.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.widgets.js"></script><script src="/libs/tablesorter-master/js/widgets/widget-sortTbodies.js"></script><script type="text/javascript" src="/libs/jquery.qtip.js"></script><script type="text/javascript" src="/libs/jquery-ui.min.js"></script><script type="text/javascript" src="/libs/jquery.ba-urlinternal.min.js"></script><script type="text/javascript" src="/libs/d3.4_10_0.min.js"></script><script type="text/javascript" src="/libs/polybool.min.js"></script><script src="/libs/jquery.mark.min.js"></script><style>body{padding-bottom:40px;background-color:#fff}</style><link href="/static/css/main.23c18382.chunk.css" rel="stylesheet"></head><body><div id="notification"></div><div id="admin_notices"></div><span style="visibility:hidden;position:absolute;s-index:-5;top:0;left:0" id="invisible" class="details-subject"></span><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="/static/js/runtime~main.42ac5946.js"></script><script src="/static/js/2.9e5a29d8.chunk.js"></script><script src="/static/js/main.16aea81c.chunk.js"></script></body></html>
1+
<!doctype html><html lang="en"><head><meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-eval' ; style-src 'self' 'unsafe-inline' blob:; frame-src 'self'; "><meta http-equiv="pragma" content="no-cache"/><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content=""><meta name="author" content=""><meta name="referrer" content="no-referrer"><title>SCOT 3.7</title><script type="text/javascript" src="/libs/tinymce/js/tinymce/tinymce.min.js"></script><link rel="stylesheet" href="/css/revl.css"><link rel="manifest" href="/manifest.json"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap.min.css"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap-grid.min.css"><link rel="stylesheet" href="/css/react-table.css"><link rel="stylesheet" href="/css/font-awesome.min.css"><link rel="stylesheet" href="/css/react-calendar.css"><link rel="stylesheet" href="/css/reactTags.css"><link rel="stylesheet" href="/css/jquery.qtip.css"><link rel="stylesheet" href="/css/table-twbs.css"><link rel="stylesheet" href="/css/jquery-ui.css"><link rel="stylesheet" href="/css/codemirror.min.css"><link rel="stylesheet" href="/css/react-datetime.css"><link rel="stylesheet" href="/libs/tablesorter-master/css/theme.default.css"><link rel="stylesheet" href="/css/styles.css"><link rel="stylesheet" href="/css/sandbox.css"><link rel="stylesheet" href="/css/scot.css"><script type="text/javascript" src="/libs/jquery-3.3.1/jquery.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap.min.js"></script><script type="text/javascript" src="/libs/jquery-2.1.1.1-nav.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap-nav.min.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.widgets.js"></script><script src="/libs/tablesorter-master/js/widgets/widget-sortTbodies.js"></script><script type="text/javascript" src="/libs/jquery.qtip.js"></script><script type="text/javascript" src="/libs/jquery-ui.min.js"></script><script type="text/javascript" src="/libs/jquery.ba-urlinternal.min.js"></script><script type="text/javascript" src="/libs/d3.4_10_0.min.js"></script><script type="text/javascript" src="/libs/polybool.min.js"></script><script src="/libs/jquery.mark.min.js"></script><style>body{padding-bottom:40px;background-color:#fff}</style><link href="/static/css/main.23c18382.chunk.css" rel="stylesheet"></head><body><div id="notification"></div><div id="admin_notices"></div><span style="visibility:hidden;position:absolute;s-index:-5;top:0;left:0" id="invisible" class="details-subject"></span><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="/static/js/runtime~main.42ac5946.js"></script><script src="/static/js/2.9e5a29d8.chunk.js"></script><script src="/static/js/main.18274205.chunk.js"></script></body></html>

‎public/precache-manifest.e145a3fb9c244648c263d58e265f4402.js renamed to ‎public/precache-manifest.d41beb2efa7c244743d8d264527b4e15.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ self.__precacheManifest = [
88
"url": "/static/js/runtime~main.42ac5946.js"
99
},
1010
{
11-
"revision": "16aea81ca19c78de6018",
12-
"url": "/static/js/main.16aea81c.chunk.js"
11+
"revision": "18274205ba0b8089b066",
12+
"url": "/static/js/main.18274205.chunk.js"
1313
},
1414
{
1515
"revision": "9e5a29d820795173515e",
1616
"url": "/static/js/2.9e5a29d8.chunk.js"
1717
},
1818
{
19-
"revision": "16aea81ca19c78de6018",
19+
"revision": "18274205ba0b8089b066",
2020
"url": "/static/css/main.23c18382.chunk.css"
2121
},
2222
{
23-
"revision": "2df01cdbb5c9e4ffb24ba9c1486ea493",
23+
"revision": "0400ee815de3dec6785e548cb4a73cce",
2424
"url": "/index.html"
2525
}
2626
];

‎public/service-worker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
1515

1616
importScripts(
17-
"/precache-manifest.e145a3fb9c244648c263d58e265f4402.js"
17+
"/precache-manifest.d41beb2efa7c244743d8d264527b4e15.js"
1818
);
1919

2020
workbox.clientsClaim();

‎public/static/js/main.16aea81c.chunk.js

-2
This file was deleted.

‎public/static/js/main.16aea81c.chunk.js.map

-1
This file was deleted.

‎public/static/js/main.18274205.chunk.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/static/js/main.18274205.chunk.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scot-ui/src/list/tableConfig.js

+12-19
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ const columnDefinitions = {
462462
},
463463

464464
EntryCountColumn: {
465-
width: 95,
465+
width: 50,
466466
resizable: true,
467467
expander: true,
468468
filter: false,
@@ -484,13 +484,6 @@ const columnDefinitions = {
484484
{rest.original.entry_count == 0 ? (
485485
<Add />
486486
) : (
487-
// <Button2
488-
// variant="contained"
489-
// size="small"
490-
// style={{ backgroundColor: "#5cb85c", color: "white" }}
491-
// >
492-
// +
493-
// </Button2>
494487
<Button2
495488
variant="contained"
496489
size="small"
@@ -736,39 +729,39 @@ export const getColumnWidth = (data, accessor, headerText) => {
736729
}
737730
const maxWidth = 500;
738731
let magicLength = 0;
739-
let re = new RegExp("^<svg\\b[^>]*>(.*?)<\\/svg>$");
740732
const cellLength = Math.max(
741733
...data.map(function(row) {
742734
let newtext = row[headerText];
743735
var canvas = document.createElement("canvas");
744736
var ctx = canvas.getContext("2d");
737+
ctx.font = "12px Arial"
738+
let re = new RegExp("^<svg\\b[^>]*>(.*?)<\\/svg>$");
745739
if (newtext !== undefined) {
746740
if (re.test(newtext)) {
747-
return 210;
741+
return 300;
742+
748743
} else {
744+
let doc = new DOMParser().parseFromString(newtext, "text/html");
745+
let width = width = ctx.measureText(doc).width;
749746
if (newtext.includes("entity")) {
750-
//lets count the number of occurences of entity
751-
let entitycount = (newtext.match(new RegExp("entity", "g")) || [])
752-
.length;
753-
magicLength = 10 * entitycount;
754-
newtext = newtext.replace(/<[^>]*>?/g, "");
747+
magicLength = 150;
755748
}
756-
//return ctx.measureText(newtext).width;
757-
return newtext.length + 100;
758-
//return ctx.measureText(newtext).width;
749+
return width;
759750
}
760751
}
761752
}),
762-
headerText.length + 100
753+
headerText.length
763754
);
764755

756+
let re = new RegExp("^<svg\\b[^>]*>(.*?)<\\/svg>$");
765757
if (headerText === "Entries") {
766758
return 70;
767759
} else {
768760
return Math.min(maxWidth, cellLength + magicLength);
769761
}
770762
};
771763

764+
772765
class PromotionButton extends React.Component {
773766
constructor(props) {
774767
super(props);

0 commit comments

Comments
 (0)