Skip to content

Lgk 108 router - Separated Router component #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lgk-bsw wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Lgk 108 router - Separated Router component #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba114be
#108 New Router component
lgk-bsw Jul 22, 2022
0876cfa
#108 Remove routing system in Layout
lgk-bsw Jul 22, 2022
6df6ee6
#108 Build
lgk-bsw Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion dist/components/ActionMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,16 @@ function ActionMenu(props) {
children = props.children,
className = props.className,
_props$toggleIcon = props.toggleIcon,
toggleIcon = _props$toggleIcon === void 0 ? "bi-iconmonstr-menu-7" : _props$toggleIcon;
toggleIcon = _props$toggleIcon === void 0 ? /*#__PURE__*/_react.default.createElement("svg", {
xmlns: "http://www.w3.org/2000/svg",
width: "16",
height: "16",
fill: "currentColor",
className: "bi bi-three-dots-vertical",
viewBox: "0 0 16 16"
}, /*#__PURE__*/_react.default.createElement("path", {
d: "M9.5 13a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm0-5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm0-5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"
})) : _props$toggleIcon;

var _break = props.break || "lg";

Expand Down
123 changes: 5 additions & 118 deletions dist/components/Layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,8 @@ var Layout = /*#__PURE__*/function (_Component) {

_this = _super.call(this, props);
window.blueLayoutRef = _assertThisInitialized(_this);
_this.defaultMatch = ["home"];
_this.state = {
sidebarIn: props.sidebarIn,
match: null,
history: [],
hash: window.location.hash,
hashHistory: [],
blockRouting: props.blockRouting || undefined
sidebarIn: props.sidebarIn
};
_this.hideSidebar = _this.hideSidebar.bind(_assertThisInitialized(_this));
_this.eventListeners = [];
Expand All @@ -99,7 +93,6 @@ var Layout = /*#__PURE__*/function (_Component) {
document.addEventListener("toggleSidebar", function () {
_this2.toggleSidebar(undefined);
}, false);
this.initMatch();
document.addEventListener("touchstart", function (event) {
var xPos = event.touches[0].pageX;

Expand All @@ -109,47 +102,6 @@ var Layout = /*#__PURE__*/function (_Component) {
me.toggleSidebar(event);
}
});
window.addEventListener("hashchange", this.onHashChange);
}
}, {
key: "componentWillUnmount",
value: function componentWillUnmount() {
window.removeEventListener("hashchange", this.onHashChange);
}
}, {
key: "componentDidUpdate",
value: function componentDidUpdate(prevProps, prevState) {
var _this3 = this;

if (prevProps.blockRouting !== this.props.blockRouting && this.props.blockRouting !== this.state.blockRouting) {
this.setState({
blockRouting: this.props.blockRouting
});
}

this.eventListeners.forEach(function (eventListener) {
if (eventListener[0] === "componentDidUpdate") {
eventListener[1](prevProps, prevState);
}

if (eventListener[0] === "pageDidShowAgain") {
var pageId = eventListener[1];
var callback = eventListener[2];

if (prevState.hash !== _this3.state.hash && _this3.state.match[0] === pageId) {
callback(prevProps, prevState);
}
}

if (eventListener[0] === "pageDidHide") {
var _pageId = eventListener[1];
var _callback = eventListener[2];

if (prevState.hash !== _this3.state.hash && prevState.match[0] === _pageId) {
_callback(prevProps, prevState);
}
}
});
}
}, {
key: "toggleSidebar",
Expand All @@ -171,69 +123,10 @@ var Layout = /*#__PURE__*/function (_Component) {
});
}
}
}, {
key: "initMatch",
value: function initMatch() {
var newMatch;

if (window.location.hash && window.location.hash !== "" && window.location.hash !== "#/") {
newMatch = window.location.hash.replace("#", "").split("/").filter(function (n) {
return n !== "";
});
} else {
newMatch = this.defaultMatch;
}

if (this.props.unrouteable) {
newMatch = this.defaultMatch;
}

if (this.state.blockRouting && this.state.blockRouting(newMatch, this.state.match) === true) {
window.location.hash = this.state.hash;
} else {
if (!(this.state.history.indexOf(newMatch[0]) > -1)) {
this.state.history.push(newMatch[0]);
}

this.setState({
match: newMatch,
history: this.state.history,
hash: window.location.hash,
hashHistory: this.state.hashHistory.concat([window.location.hash])
});
}
}
}, {
key: "addEventListener",
value: function addEventListener(param1, param2, param3, listenerId) {
this.eventListeners.push([param1, param2, param3, listenerId]);
this.removeDuplicatedEventListeners();
}
}, {
key: "removeEventListener",
value: function removeEventListener(type, listenerId) {
this.eventListeners = this.eventListeners.filter(function (param) {
if (param[0] !== type) {
return param;
} else if (param[0] === type && param[3] !== listenerId) {
return param;
}
});
}
}, {
key: "removeDuplicatedEventListeners",
value: function removeDuplicatedEventListeners() {
this.eventListeners = this.eventListeners.filter(function (value, index, self) {
return index === self.findIndex(function (t) {
return t[3] === value[3] && t[0] === value[0];
});
});
}
}, {
key: "render",
value: function render() {
var _this4 = this,
_this$props$pages;
var _this3 = this;

return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
className: "blue-wrapper"
Expand All @@ -248,18 +141,13 @@ var Layout = /*#__PURE__*/function (_Component) {
type: "button",
className: "blue-open-menu blue-menu-item btn",
onClick: function onClick() {
_this4.setState({
sidebarIn: !_this4.state.sidebarIn
_this3.setState({
sidebarIn: !_this3.state.sidebarIn
});
}
}, /*#__PURE__*/_react.default.createElement("div", {
className: "blue-sidebar-exception position-absolute w-100 h-100"
}), this.props.sidebarToggleIconComponent) : ""), this.props.children, (_this$props$pages = this.props.pages) === null || _this$props$pages === void 0 ? void 0 : _this$props$pages.map(function (page) {
return _this4.state.history.indexOf(page.name) > -1 && /*#__PURE__*/_react.default.createElement("div", {
key: page.name,
className: "router-page " + (_this4.state.match[0] === page.name ? "active" : "")
}, page.component);
}), /*#__PURE__*/_react.default.createElement("div", {
}), this.props.sidebarToggleIconComponent) : ""), this.props.children, /*#__PURE__*/_react.default.createElement("div", {
className: "blue-status-circle blue-loading blue-status-loading"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "spinner-bounce-circle"
Expand Down Expand Up @@ -287,7 +175,6 @@ var Layout = /*#__PURE__*/function (_Component) {
return {
expandSidebar: false,
hideSidebarMenu: false,
unrouteable: false,
disableTitleSet: false,
sidebarToggleIconComponent: /*#__PURE__*/_react.default.createElement("span", {
className: "bi-menu"
Expand Down
Loading