fix channels sidebar

hero-org · Aug 24, 2023 · 725cf9e · 725cf9e
1 parent 2e05df4
commit 725cf9e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/common/components/RightSidebar/ChannelsOverview.tsx b/src/common/components/RightSidebar/ChannelsOverview.tsx
@@ -6,6 +6,7 @@ import { SidebarHeader } from "./SidebarHeader";
 
 const ChannelsOverview = () => {
  const [showAll, setShowAll] = useState(false);
+ const MAX_SIDEBAR_CHANNELS = 9;
  const {
  channels,
  selectedChannelIdx,
@@ -16,6 +17,11 @@ const ChannelsOverview = () => {
  setShowAll(!showAll);
  }
 
+ let sidebarChannels = showAll ? channels : channels.slice(0, MAX_SIDEBAR_CHANNELS);
+ if (!showAll && selectedChannelIdx && selectedChannelIdx >= MAX_SIDEBAR_CHANNELS) {
+ sidebarChannels.push(channels[selectedChannelIdx]);
+ }
+
  return (<>
  <SidebarHeader title="Channels" actionTitle={showAll ? 'Show less' : 'Show all'} onClick={onToggleShowAll} />
  <ul role="list" className="mx-4 m-4">
@@ -35,12 +41,12 @@ const ChannelsOverview = () => {
  </kbd>
  </span>
  </li>
- {(showAll ? channels : channels.slice(0, 9)).map((channel: ChannelType, idx: number) => (
+ {(sidebarChannels).map((channel: ChannelType, idx: number) => (
  <li key={channel.name} className="px-2 sm:px-3 lg:px-4">
  <div
  onClick={() => setCurrentChannelIdx(idx)}
  className={classNames(
- selectedChannelIdx == idx
+ (showAll && selectedChannelIdx === idx) || (!showAll && idx === MAX_SIDEBAR_CHANNELS)
  ? 'text-white font-semibold'
  : 'text-gray-400 hover:text-white',
  'flex align-center justify-between flex gap-x-3 rounded-md p-1 text-sm leading-6 cursor-pointer'

diff --git a/src/pages/Home/index.tsx b/src/pages/Home/index.tsx
@@ -62,7 +62,6 @@ export default function Home() {
  const navItem = navigation.find((item) => item.router === pathname) || { name: 'herocast', getTitle: null }
  const title = navItem.getTitle ? navItem.getTitle() : navItem.name;
  const pageNavigation = pathname !== '/login' ? { rightSidebar: RIGHT_SIDEBAR_ENUM.ACCOUNTS } : {};
- console.log('pageNavigation', pageNavigation, 'pathname', pathname);
 
  useEffect(() => {
  trackPageView(pathname.slice(1));

diff --git a/src/pages/Settings/index.tsx b/src/pages/Settings/index.tsx
@@ -46,6 +46,10 @@ export default function Settings() {
  const renderInfoSection = () => {
  let commands: SimpleCommand[] = [
  { name: 'Command Palette', shortcut: 'cmd+k' },
+ { name: 'Feed: go to previous cast in list', shortcut: 'k' },
+ { name: 'Feed: go to next cast in list', shortcut: 'j' },
+ { name: 'Feed: Open thread view for cast (currently showing Warpcast)', shortcut: 'o' },
+ { name: 'Feed: Open embedded link in new tab', shortcut: 'shift+o' },
  // ...navigationCommands,
  ...newPostCommands,
  ...accountCommands,