From e69395d46dc4feed56d67996c9e099e463a8b690 Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Tue, 14 Sep 2021 18:52:52 -0500 Subject: [PATCH] favicon: adding temp favicon and added symbol ignoring to leap --- pkg/grid/index.html | 3 ++- pkg/grid/src/assets/favicon.png | Bin 0 -> 4140 bytes pkg/grid/src/assets/favicon.svg | 11 +++++++++++ pkg/grid/src/favicon.svg | 15 --------------- pkg/grid/src/nav/Leap.tsx | 22 ++++++++++++++++++---- pkg/grid/src/nav/search/Apps.tsx | 2 ++ 6 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 pkg/grid/src/assets/favicon.png create mode 100644 pkg/grid/src/assets/favicon.svg delete mode 100644 pkg/grid/src/favicon.svg diff --git a/pkg/grid/index.html b/pkg/grid/index.html index ee7d7eeed..8ca4f0d63 100644 --- a/pkg/grid/index.html +++ b/pkg/grid/index.html @@ -2,7 +2,8 @@ - + + Landscape • Home diff --git a/pkg/grid/src/assets/favicon.png b/pkg/grid/src/assets/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..817ca1a8aef2dabdf803b34b51b758a33289d0c6 GIT binary patch literal 4140 zcmeH~=~I(e6vl7ZLWmNogSZDfbi-6;u#L1}009ZLN?0@o!eS{wC4gm-MIc}W)Jjok zVCt)pT|fxP%T_fSVT8f(iV%Z@fPj=G2u2`*5{T(br|lom>6cbM+`0EWGiT1so%5XE zy%%VQT-O?HHUa>wb)!0a0-%E)b%3D(x+&wHsnHF0ipq!r0Ka}^VZhaE8&MGx<>|T) z@Skjzqk&$C<3UFNZfD__kLd$IcPOU)TcRDt9o8>SDenJ$z(EUn+ObRMZ?mqVFGDLFYgv-8uwbQ99R5i=mZ}lx`Kf5i8#uI-q4x&;b8>LX)&VTK%nsZ32DsinJ*r4OQiot&)r zD_0vMd`hS2gO-TV15~Z6bICuI;+CFejm@gK_#ERA<%}s;f~lF^xuuG z7SbxKs<_c)(dD`Zv`GV#k_1B9rTsd&n|x&{X&hb@>h2pJ+ec(FNOP79?8T zbQhrP?dds^TF~3yPm;59cbo`=ktCzQpr9g$LCH>B55y*I8=)7*Mo}%3z>gQ*!CjVEF-04e!fAbzgtk)tcQ^Q@dPXo2%1s% zb@~jf*zw}o`xV#=x3oklDM>QRf;86o>Ws17txC7O&gj^}+lRo)gQ(5bG7un07;Si8 zK)VsI9YdgI1)6cCMp~+y-y;*>bjL?ekBaibHG?Tgw;2u!`w~>BUmtArlY0v4HA4@- zZ$^4aeg~ve#H9dks~;zMZfdGh=!e!Ovb3o4xy1-Sak1ju#;mr{p`m=HzyF4#rE2vs z9MZ|6!+*^=Qy_Wt$R+;m^5WEunl-BHQ!0e*KNqkD3YL2A*Ch5Fg@^aj~f|P~S8j_dtCP32>0#_^+M6jjhTrBit;nUjO6%qDbvq z&Fq_DCoI*ymox}Vq4!WSmMvm27-0WDfaJdc{8iAdf_4?OtFMTE@Q7Lk?J8*BLC{WU YA1 + + + + + + diff --git a/pkg/grid/src/favicon.svg b/pkg/grid/src/favicon.svg deleted file mode 100644 index de4aeddc1..000000000 --- a/pkg/grid/src/favicon.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/pkg/grid/src/nav/Leap.tsx b/pkg/grid/src/nav/Leap.tsx index d754b1793..25c4882a1 100644 --- a/pkg/grid/src/nav/Leap.tsx +++ b/pkg/grid/src/nav/Leap.tsx @@ -38,6 +38,16 @@ type LeapProps = { shouldDim: boolean; } & HTMLAttributes; +function normalizeMatchString(match: string, keepAltChars: boolean): string { + let normalizedString = match.toLocaleLowerCase().trim(); + + if (!keepAltChars) { + normalizedString = normalizedString.replace(/[^\w]/, ''); + } + + return normalizedString; +} + export const Leap = React.forwardRef( ({ menu, dropdown, navOpen, shouldDim, className }: LeapProps, ref) => { const { push } = useHistory(); @@ -78,11 +88,12 @@ export const Leap = React.forwardRef( const getMatch = useCallback( (value: string) => { - const normValue = value.toLocaleLowerCase(); + const onlySymbols = !value.match(/[\w]/g); + const normValue = normalizeMatchString(value, onlySymbols); return matches.find( (m) => - m.display?.toLocaleLowerCase().startsWith(normValue) || - m.value.toLocaleLowerCase().startsWith(normValue) + (m.display && normalizeMatchString(m.display, onlySymbols).startsWith(normValue)) || + normalizeMatchString(m.value, onlySymbols).startsWith(normValue) ); }, [matches] @@ -121,7 +132,10 @@ export const Leap = React.forwardRef( if (matchValue && inputRef.current && !isDeletion) { inputRef.current.value = matchValue; - inputRef.current.setSelectionRange(value.length, matchValue.length); + const start = matchValue.startsWith(value) + ? value.length + : matchValue.substring(0, matchValue.indexOf(value)).length + value.length; + inputRef.current.setSelectionRange(start, matchValue.length); useLeapStore.setState({ rawInput: matchValue, selectedMatch: inputMatch diff --git a/pkg/grid/src/nav/search/Apps.tsx b/pkg/grid/src/nav/search/Apps.tsx index 78b014189..4d19008d7 100644 --- a/pkg/grid/src/nav/search/Apps.tsx +++ b/pkg/grid/src/nav/search/Apps.tsx @@ -6,6 +6,7 @@ import { ShipName } from '../../components/ShipName'; import useDocketState, { useAllyTreaties } from '../../state/docket'; import { useLeapStore } from '../Nav'; import { AppList } from '../../components/AppList'; +import { addRecentDev } from './Home'; type AppsProps = RouteComponentProps<{ ship: string }>; @@ -68,6 +69,7 @@ export const Apps = ({ match }: AppsProps) => { useEffect(() => { if (provider) { useDocketState.getState().fetchAllyTreaties(provider); + addRecentDev(provider); } }, [provider]);