@churchapps/apphelper 0.2.92 → 0.2.94

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,7 +4,7 @@ interface Props {
4
4
  url: string;
5
5
  label: string;
6
6
  }[];
7
- onNavigate?: (url: string) => void;
7
+ onNavigate: (url: string) => void;
8
8
  }
9
9
  export declare const SecondaryMenu: (props: Props) => import("react/jsx-runtime").JSX.Element;
10
10
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"SecondaryMenu.d.ts","sourceRoot":"","sources":["../../../src/components/header/SecondaryMenu.tsx"],"names":[],"mappings":"AAEA,UAAU,KAAK;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IAC5C,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED,eAAO,MAAM,aAAa,UAAS,KAAK,4CAcvC,CAAA"}
1
+ {"version":3,"file":"SecondaryMenu.d.ts","sourceRoot":"","sources":["../../../src/components/header/SecondaryMenu.tsx"],"names":[],"mappings":"AAEA,UAAU,KAAK;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IAC5C,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC;AAED,eAAO,MAAM,aAAa,UAAS,KAAK,4CAcvC,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"NavItem.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/NavItem.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,UAAU,KAAK;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAQD,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA8BnC,CAAC"}
1
+ {"version":3,"file":"NavItem.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/NavItem.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,UAAU,KAAK;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAQD,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA0BnC,CAAC"}
@@ -11,13 +11,6 @@ const StyledNavLink = (0, material_1.styled)(react_router_dom_1.NavLink)({
11
11
  "& .MuiListItemIcon-root": { minWidth: 40 }
12
12
  });
13
13
  const NavItem = (props) => {
14
- let isReact = false;
15
- try {
16
- const a = typeof (0, react_router_dom_1.useLocation)();
17
- if (a !== null)
18
- isReact = true;
19
- }
20
- catch (_a) { }
21
14
  const getIcon = () => {
22
15
  if (props.badgeCount && props.badgeCount > 0)
23
16
  return (0, jsx_runtime_1.jsx)(material_1.Badge, { badgeContent: props.badgeCount, color: "error", children: (0, jsx_runtime_1.jsx)(material_1.Icon, { children: props.icon }) });
@@ -27,10 +20,11 @@ const NavItem = (props) => {
27
20
  const getLinkContents = () => ((0, jsx_runtime_1.jsxs)(material_1.ListItemButton, { children: [(0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: props.label || "", arrow: true, placement: "right", children: (0, jsx_runtime_1.jsx)(material_1.ListItemIcon, { sx: { minWidth: "40px" }, children: getIcon() }) }), (0, jsx_runtime_1.jsx)(material_1.ListItemText, { primary: props.label }), (props === null || props === void 0 ? void 0 : props.deleteIcon)
28
21
  ? ((0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: props.deleteLabel || "", arrow: true, placement: "left", children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { onClick: props.deleteFunction ? (e) => { e.stopPropagation(); e.preventDefault(); props.deleteFunction(); } : null, sx: { color: "#f7a9a9" }, size: "small", children: (0, jsx_runtime_1.jsx)(material_1.Icon, { sx: { fontSize: 19 }, children: "delete" }) }) }))
29
22
  : ""] }));
30
- if (props.external || !isReact)
23
+ if (props.external)
31
24
  return ((0, jsx_runtime_1.jsx)("a", { href: props.url, target: props.target, rel: "noreferrer", style: { textDecoration: "none" }, className: (props.selected) ? "selected" : "", onClick: (e) => { e.preventDefault(); props.onClick ? props.onClick() : window.location.href = props.url; }, children: getLinkContents() }));
32
25
  else
33
- return ((0, jsx_runtime_1.jsx)(StyledNavLink, { to: props.url || "about:blank", target: props.target, className: (props.selected) ? "selected" : "", onClick: (e) => { e.preventDefault(); (props.onClick) ? props.onClick() : props.onNavigate(props.url); }, children: getLinkContents() }));
26
+ return ((0, jsx_runtime_1.jsx)("a", { href: "about:blank", style: { textDecoration: "none" }, className: (props.selected) ? "selected" : "", onClick: (e) => { e.preventDefault(); props.onClick ? props.onClick() : props.onNavigate(props.url); }, children: getLinkContents() }));
27
+ //else return (<StyledNavLink to={props.url || "about:blank"} target={props.target} className={(props.selected) ? "selected" : ""} onClick={(e) => { e.preventDefault(); (props.onClick) ? props.onClick() : props.onNavigate(props.url)}}>{getLinkContents()}</StyledNavLink>)
34
28
  };
35
29
  exports.NavItem = NavItem;
36
30
  //# sourceMappingURL=NavItem.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"NavItem.js","sourceRoot":"","sources":["../../../src/components/wrapper/NavItem.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NavItem.js","sourceRoot":"","sources":["../../../src/components/wrapper/NavItem.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@churchapps/apphelper",
3
- "version": "0.2.92",
3
+ "version": "0.2.94",
4
4
  "description": "Library of helper functions for React and NextJS ChurchApps",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -3,7 +3,7 @@ import { Chip } from "@mui/material";
3
3
  interface Props {
4
4
  label: string,
5
5
  menuItems: { url: string, label: string }[]
6
- onNavigate?: (url: string) => void;
6
+ onNavigate: (url: string) => void;
7
7
  }
8
8
 
9
9
  export const SecondaryMenu= (props:Props) => {
@@ -26,11 +26,6 @@ const StyledNavLink = styled(NavLink)({
26
26
  });
27
27
 
28
28
  export const NavItem: React.FC<Props> = (props) => {
29
- let isReact = false;
30
- try {
31
- const a = typeof useLocation();
32
- if (a !== null) isReact = true;
33
- } catch { }
34
29
 
35
30
  const getIcon = () => {
36
31
  if (props.badgeCount && props.badgeCount > 0) return <Badge badgeContent={props.badgeCount} color="error"><Icon>{props.icon}</Icon></Badge>
@@ -53,6 +48,7 @@ export const NavItem: React.FC<Props> = (props) => {
53
48
  : ""}
54
49
  </ListItemButton>)
55
50
 
56
- if (props.external || !isReact) return (<a href={props.url} target={props.target} rel="noreferrer" style={{ textDecoration: "none" }} className={(props.selected) ? "selected" : ""} onClick={(e) => { e.preventDefault(); props.onClick ? props.onClick() : window.location.href = props.url }}>{getLinkContents()}</a>)
57
- else return (<StyledNavLink to={props.url || "about:blank"} target={props.target} className={(props.selected) ? "selected" : ""} onClick={(e) => { e.preventDefault(); (props.onClick) ? props.onClick() : props.onNavigate(props.url)}}>{getLinkContents()}</StyledNavLink>)
51
+ if (props.external) return (<a href={props.url} target={props.target} rel="noreferrer" style={{ textDecoration: "none" }} className={(props.selected) ? "selected" : ""} onClick={(e) => { e.preventDefault(); props.onClick ? props.onClick() : window.location.href = props.url }}>{getLinkContents()}</a>)
52
+ else return (<a href="about:blank" style={{ textDecoration: "none" }} className={(props.selected) ? "selected" : ""} onClick={(e) => { e.preventDefault(); props.onClick ? props.onClick() : props.onNavigate(props.url) }}>{getLinkContents()}</a>)
53
+ //else return (<StyledNavLink to={props.url || "about:blank"} target={props.target} className={(props.selected) ? "selected" : ""} onClick={(e) => { e.preventDefault(); (props.onClick) ? props.onClick() : props.onNavigate(props.url)}}>{getLinkContents()}</StyledNavLink>)
58
54
  };