From 59348c7601f51c82f2df52b076ec687e4d60ccd2 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 11 Jan 2021 06:18:45 +0000 Subject: [PATCH 1/2] Make keybinds clearer --- docs/src/modules/branding/AppSearch.tsx | 2 +- docs/src/modules/components/AppSearch.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/modules/branding/AppSearch.tsx b/docs/src/modules/branding/AppSearch.tsx index 11200cfc83c4ac..cb9d9326c83f37 100644 --- a/docs/src/modules/branding/AppSearch.tsx +++ b/docs/src/modules/branding/AppSearch.tsx @@ -163,7 +163,7 @@ export default function AppSearch() { }} />
- {macOS ? '⌘' : 'Ctrl'}K + {macOS ? '⌘' : 'Ctrl'}+K
); diff --git a/docs/src/modules/components/AppSearch.js b/docs/src/modules/components/AppSearch.js index f2c38eeba47778..715a5facdd68b5 100644 --- a/docs/src/modules/components/AppSearch.js +++ b/docs/src/modules/components/AppSearch.js @@ -269,7 +269,7 @@ export default function AppSearch() { />
{/* eslint-disable-next-line material-ui/no-hardcoded-labels */} - {macOS ? '⌘' : 'Ctrl+'}K + {macOS ? '⌘' : 'Ctrl'}+K
); From 6a3ee8cbf75eb85611172eb346b67890492a6abd Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Mon, 11 Jan 2021 23:47:30 +0100 Subject: [PATCH 2/2] backport fixes until we solve the duplication --- docs/src/modules/branding/AppSearch.tsx | 5 ++++- docs/src/modules/components/AppSearch.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/src/modules/branding/AppSearch.tsx b/docs/src/modules/branding/AppSearch.tsx index cb9d9326c83f37..cc37a5308e79d9 100644 --- a/docs/src/modules/branding/AppSearch.tsx +++ b/docs/src/modules/branding/AppSearch.tsx @@ -113,6 +113,9 @@ const useStyles = makeStyles( transition: theme.transitions.create('opacity', { duration: theme.transitions.duration.shortest, }), + // So that clicks target the input. + // Makes the text non selectable but neither is the placeholder or adornment. + pointerEvents: 'none', '&.Mui-focused': { opacity: 0, }, @@ -163,7 +166,7 @@ export default function AppSearch() { }} />
- {macOS ? '⌘' : 'Ctrl'}+K + {macOS ? '⌘' : 'Ctrl+'}K
); diff --git a/docs/src/modules/components/AppSearch.js b/docs/src/modules/components/AppSearch.js index 715a5facdd68b5..f2c38eeba47778 100644 --- a/docs/src/modules/components/AppSearch.js +++ b/docs/src/modules/components/AppSearch.js @@ -269,7 +269,7 @@ export default function AppSearch() { />
{/* eslint-disable-next-line material-ui/no-hardcoded-labels */} - {macOS ? '⌘' : 'Ctrl'}+K + {macOS ? '⌘' : 'Ctrl+'}K
);