studiokit-scaffolding-js 7.0.12 → 7.0.13-alpha.1

package/lib/components/UserRoles/RoleCell.js

@@ -91,8 +91,8 @@ var RoleCell = function (_a) {
                 react_1.default.createElement(Inline_1.RefreshIndicatorInline, { size: 20, className: "ma3" }))) : canDelete ? (react_1.default.createElement(core_1.IconButton, { className: "remove-user-button", "aria-label": "Remove " + roleText, onClick: function () {
                     removeUserRole(userRole);
                 }, disabled: isUpdating || isRemoving },
-                react_1.default.createElement(Delete_1.default, { color: "error" }))) : isUserRoleExternal ? (react_1.default.createElement(react_bootstrap_1.OverlayTrigger, { placement: "auto", trigger: ['click', 'hover', 'focus'], overlay: isExternalPopover },
-                react_1.default.createElement(IconExternalUser_1.IconExternalUser, { tabIndex: 0, style: { margin: '12px', opacity: 0.5 }, className: "external-icon" }))) : (
+                react_1.default.createElement(Delete_1.default, { color: "error" }))) : isUserRoleExternal ? (react_1.default.createElement(react_bootstrap_1.OverlayTrigger, { placement: "auto", trigger: ['hover', 'focus'], overlay: isExternalPopover },
+                react_1.default.createElement(IconExternalUser_1.IconExternalUser, { tabIndex: 0, style: { margin: '12px', opacity: 0.5 }, className: "external-icon", titleAccess: "External Role" }))) : (
             // dummy spacer to keep items aligned
             react_1.default.createElement("span", { style: {
                     margin: '12px',

package/lib/components/UserRoles/Select.js

@@ -30,16 +30,19 @@ var Help_1 = __importDefault(require("@material-ui/icons/Help"));
 var react_1 = __importDefault(require("react"));
 var react_bootstrap_1 = require("react-bootstrap");
 var baseRole_1 = require("../../utils/baseRole");
-var label = function (hasMultipleOptions, labelVisible, hasTooltip) {
+var label = function (hasMultipleOptions, labelVisible, hasTooltip, ref) {
     var content = (react_1.default.createElement(react_1.default.Fragment, null,
         "Role",
-        hasTooltip && react_1.default.createElement(Help_1.default, { color: "primary", className: "ml1 v-mid", tabIndex: 0 })));
+        hasTooltip && react_1.default.createElement(Help_1.default, { ref: ref, color: "primary", className: "ml1 v-mid", tabIndex: 0, titleAccess: "help" })));
     var classes = "f6 mb1 " + (!labelVisible ? 'visually-hidden' : '');
     return hasMultipleOptions ? (react_1.default.createElement(react_bootstrap_1.FormLabel, { className: classes }, content)) : (react_1.default.createElement("span", { className: classes + ' b' }, content));
 };
 var overlay = function (hasMultipleOptions, labelVisible, rolePopover) {
     if (labelVisible === void 0) { labelVisible = false; }
-    return rolePopover ? (react_1.default.createElement(react_bootstrap_1.OverlayTrigger, { placement: "right", trigger: ['click', 'hover', 'focus'], overlay: rolePopover }, label(hasMultipleOptions, labelVisible, true))) : (label(hasMultipleOptions, labelVisible, false));
+    return rolePopover ? (react_1.default.createElement(react_bootstrap_1.OverlayTrigger, { placement: "right", trigger: ['hover', 'focus'], overlay: rolePopover }, function (_a) {
+        var ref = _a.ref, triggerHandler = __rest(_a, ["ref"]);
+        return (react_1.default.createElement("span", __assign({}, triggerHandler), label(hasMultipleOptions, labelVisible, true, ref)));
+    })) : (label(hasMultipleOptions, labelVisible, false));
 };
 var RoleSelectControl = function (_a) {
     var className = _a.className, options = _a.options, value = _a.value, onChange = _a.onChange, textForRole = _a.textForRole, disabled = _a.disabled;

package/lib/utils/url.js

@@ -78,7 +78,8 @@ function hasHttpProtocol(url) {
 }
 exports.hasHttpProtocol = hasHttpProtocol;
 function isUrlValid(url) {
-    return /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=]+$/.test(url);
+    // modified from https://stackoverflow.com/a/3809435
+    return /^(https?:\/\/)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&/[\]!$&'*+,;=]*)$/.test(url);
 }
 exports.isUrlValid = isUrlValid;
 /** The total number of tries for `fetchText`, including the initial request. */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "studiokit-scaffolding-js",
-	"version": "7.0.12",
+	"version": "7.0.13-alpha.1",
 	"description": "Common scaffolding for Studio apps at Purdue",
 	"repository": "https://gitlab.com/purdue-informatics/studiokit/studiokit-scaffolding-js",
 	"license": "MIT",