fixes for smart notes, default annotation color and some small style …

…stuff
WorldBrain · Feb 26, 2024 · ecc08c5 · ecc08c5
1 parent 5d737bf
commit ecc08c5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common
diff --git a/src/annotations/components/AnnotationEdit.tsx b/src/annotations/components/AnnotationEdit.tsx
@@ -68,23 +68,25 @@ class AnnotationEdit extends React.Component<Props> {
 
  async componentDidMount() {
  await this.youtubeKeyboardShortcut()
- this.editorRef?.setEditable(this.props?.isEditMode ?? false)
+ this.editorRef?.setEditable(this.props?.isEditMode)
 
  if (!this.editorRef?.checkIfHasContent() && !this.props.isEditMode) {
  this.setState({ shouldShowEditor: false })
+ } else if (this.props.isEditMode) {
+ this.setState({ shouldShowEditor: true })
  }
  }
 
  componentDidUpdate(prevProps: Props) {
  if (prevProps.isEditMode !== this.props.isEditMode) {
- this.editorRef?.setEditable(this.props?.isEditMode ?? false)
+ this.editorRef?.setEditable(this.props?.isEditMode)
 
  if (
  !this.editorRef?.checkIfHasContent() &&
  !this.props.isEditMode
  ) {
  this.setState({ shouldShowEditor: false })
- } else {
+ } else if (this.props.isEditMode) {
  this.setState({ shouldShowEditor: true })
  }
  }

diff --git a/src/content-scripts/content_script/global.ts b/src/content-scripts/content_script/global.ts
@@ -671,11 +671,16 @@ export async function main(
  shouldCopyShareLink: boolean,
  showSpacePicker?: boolean,
  commentText?: string,
+ highlightColorSetting?: HighlightColor,
  ) => {
  if (!(await pageActionAllowed(analyticsBG))) {
  return
  }
 
+ const highlightColorSettingStorage = await getHighlightColorSettings()
+ const highlightColor =
+ highlightColorSetting ?? highlightColorSettingStorage[0]
+
  let screenshotGrabResult
  if (
  isPdfViewerRunning &&
@@ -704,6 +709,7 @@ export async function main(
  screenshotGrabResult.anchor,
  screenshotGrabResult.screenshot,
  imageSupportBG,
+ highlightColor,
  )
 
  const annotationId = result.annotationId
@@ -729,6 +735,10 @@ export async function main(
  const result = await saveHighlight(
  shouldShare,
  shouldCopyShareLink,
+ null,
+ null,
+ imageSupportBG,
+ highlightColor,
  )
 
  const annotationId = result.annotationId

diff --git a/src/dashboard-refactor/index.tsx b/src/dashboard-refactor/index.tsx
@@ -2003,6 +2003,7 @@ const Container = styled.div<{
  fullSizeInPage: boolean
 }>`
  display: flex;
+ position: relative;
  flex-direction: column;
  width: fill-available;
  background-color: ${(props) =>

diff --git a/src/overview/help-btn/components/help-btn.tsx b/src/overview/help-btn/components/help-btn.tsx
@@ -247,7 +247,7 @@ const HelpIconPosition = styled.div`
  justify-content: space-between;
  height: fit-content;
  width: fit-content;
- position: fixed;
+ position: absolute;
  bottom: 10px;
  right: 10px;
  z-index: 100;

diff --git a/src/sidebar/annotations-sidebar/containers/logic.ts b/src/sidebar/annotations-sidebar/containers/logic.ts
@@ -4655,7 +4655,7 @@ export class SidebarContainerLogic extends UILogic<
  let prompt = event.prompt ?? 'Summarise this concisely and briefly'
 
  await this.queryAI(
- undefined,
+ this.fullPageUrl,
  combinedText,
  prompt,
  previousState,