feat: Initial clean release of CHM
一些检查失败了
automerge / automerge (push) Has been cancelled
react-native-android-build-apk / AssembleRelease (push) Has been cancelled
Build macOS M1 / Main (push) Has been cancelled
Joplin Continuous Integration / Main (macos-15-intel) (push) Has been cancelled
Joplin Continuous Integration / Main (ubuntu-22.04) (push) Has been cancelled
Joplin Continuous Integration / Main (ubuntu-22.04-arm) (push) Has been cancelled
Joplin Continuous Integration / Main (windows-11-vs2026-arm) (push) Has been cancelled
Joplin Continuous Integration / Main (windows-2025) (push) Has been cancelled
Joplin Continuous Integration / ServerDockerImage (ubuntu-22.04) (push) Has been cancelled
Joplin Continuous Integration / ServerDockerImage (ubuntu-22.04-arm) (push) Has been cancelled
Joplin UI tests / Main (ubuntu-22.04) (push) Has been cancelled
Joplin UI tests / Main (windows-2025) (push) Has been cancelled
Joplin UI tests / Mobile (push) Has been cancelled
Close stale issues / ProcessStaleIssues (push) Has been cancelled
一些检查失败了
automerge / automerge (push) Has been cancelled
react-native-android-build-apk / AssembleRelease (push) Has been cancelled
Build macOS M1 / Main (push) Has been cancelled
Joplin Continuous Integration / Main (macos-15-intel) (push) Has been cancelled
Joplin Continuous Integration / Main (ubuntu-22.04) (push) Has been cancelled
Joplin Continuous Integration / Main (ubuntu-22.04-arm) (push) Has been cancelled
Joplin Continuous Integration / Main (windows-11-vs2026-arm) (push) Has been cancelled
Joplin Continuous Integration / Main (windows-2025) (push) Has been cancelled
Joplin Continuous Integration / ServerDockerImage (ubuntu-22.04) (push) Has been cancelled
Joplin Continuous Integration / ServerDockerImage (ubuntu-22.04-arm) (push) Has been cancelled
Joplin UI tests / Main (ubuntu-22.04) (push) Has been cancelled
Joplin UI tests / Main (windows-2025) (push) Has been cancelled
Joplin UI tests / Mobile (push) Has been cancelled
Close stale issues / ProcessStaleIssues (push) Has been cancelled
这个提交包含在:
@@ -0,0 +1,358 @@
|
||||
import * as React from 'react';
|
||||
import { AppState as RNAppState, View, StyleSheet, NativeEventSubscription, ViewStyle, TextStyle } from 'react-native';
|
||||
import { stateUtils } from '@joplin/lib/reducer';
|
||||
import { connect } from 'react-redux';
|
||||
import NoteList from '../../NoteList';
|
||||
import Folder from '@joplin/lib/models/Folder';
|
||||
import Tag from '@joplin/lib/models/Tag';
|
||||
import Note, { PreviewsOrder } from '@joplin/lib/models/Note';
|
||||
import Setting from '@joplin/lib/models/Setting';
|
||||
import { themeStyle } from '../../global-style';
|
||||
import { FolderPickerOptions, ScreenHeader } from '../../ScreenHeader';
|
||||
import { _ } from '@joplin/lib/locale';
|
||||
import { BaseScreenComponent } from '../../base-screen';
|
||||
import { AppState } from '../../../utils/types';
|
||||
import { FolderEntity, NoteEntity, TagEntity } from '@joplin/lib/services/database/types';
|
||||
import { getTrashFolderId, itemIsInTrash } from '@joplin/lib/services/trash';
|
||||
import AccessibleView from '../../accessibility/AccessibleView';
|
||||
import { Dispatch } from 'redux';
|
||||
import { DialogContext, DialogControl } from '../../DialogManager';
|
||||
import { useContext } from 'react';
|
||||
import { MenuChoice } from '../../DialogManager/types';
|
||||
import NewNoteButton from './NewNoteButton';
|
||||
import PerFolderSortOrderService from '@joplin/lib/services/sortOrder/PerFolderSortOrderService';
|
||||
import { ALL_NOTES_FILTER_ID } from '@joplin/lib/reserved-ids';
|
||||
|
||||
interface Props {
|
||||
dispatch: Dispatch;
|
||||
|
||||
themeId: number;
|
||||
visible: boolean;
|
||||
|
||||
folders: FolderEntity[];
|
||||
tags: TagEntity[];
|
||||
notesSource: string;
|
||||
notesOrder: PreviewsOrder[];
|
||||
uncompletedTodosOnTop: boolean;
|
||||
showCompletedTodos: boolean;
|
||||
noteSelectionEnabled: boolean;
|
||||
|
||||
selectedNoteIds: string[];
|
||||
activeFolderId: string;
|
||||
selectedFolderId: string;
|
||||
selectedTagId: string;
|
||||
selectedSmartFilterId: string;
|
||||
notesParentType: string;
|
||||
}
|
||||
|
||||
interface State {
|
||||
|
||||
}
|
||||
|
||||
interface ComponentProps extends Props {
|
||||
dialogManager: DialogControl;
|
||||
}
|
||||
|
||||
type Styles = Record<string, ViewStyle|TextStyle>;
|
||||
|
||||
class NotesScreenComponent extends BaseScreenComponent<ComponentProps, State> {
|
||||
private onAppStateChangeSub_: NativeEventSubscription = null;
|
||||
private styles_: Record<number, Styles> = {};
|
||||
private folderPickerOptions_: FolderPickerOptions;
|
||||
|
||||
public constructor(props: ComponentProps) {
|
||||
super(props);
|
||||
}
|
||||
|
||||
private onAppStateChange_ = async () => {
|
||||
// Force an update to the notes list when app state changes
|
||||
const newProps = { ...this.props };
|
||||
newProps.notesSource = '';
|
||||
await this.refreshNotes(newProps);
|
||||
};
|
||||
|
||||
private sortButton_press = async () => {
|
||||
type IdType = { name: string; value: string|boolean };
|
||||
const buttons: MenuChoice<IdType>[] = [];
|
||||
const sortNoteOptions = Setting.enumOptions('notes.sortOrder.field');
|
||||
|
||||
for (const field in sortNoteOptions) {
|
||||
if (!sortNoteOptions.hasOwnProperty(field)) continue;
|
||||
buttons.push({
|
||||
text: sortNoteOptions[field],
|
||||
iconChecked: 'fas fa-circle',
|
||||
checked: Setting.value('notes.sortOrder.field') === field,
|
||||
id: { name: 'notes.sortOrder.field', value: field },
|
||||
});
|
||||
}
|
||||
|
||||
buttons.push({
|
||||
text: `[ ${Setting.settingMetadata('notes.sortOrder.reverse').label()} ]`,
|
||||
checked: Setting.value('notes.sortOrder.reverse'),
|
||||
id: { name: 'notes.sortOrder.reverse', value: !Setting.value('notes.sortOrder.reverse') },
|
||||
});
|
||||
|
||||
buttons.push({
|
||||
text: `[ ${Setting.settingMetadata('uncompletedTodosOnTop').label()} ]`,
|
||||
checked: Setting.value('uncompletedTodosOnTop'),
|
||||
id: { name: 'uncompletedTodosOnTop', value: !Setting.value('uncompletedTodosOnTop') },
|
||||
});
|
||||
|
||||
buttons.push({
|
||||
text: `[ ${Setting.settingMetadata('showCompletedTodos').label()} ]`,
|
||||
checked: Setting.value('showCompletedTodos'),
|
||||
id: { name: 'showCompletedTodos', value: !Setting.value('showCompletedTodos') },
|
||||
});
|
||||
|
||||
const showPerFolderToggle = this.shouldShowPerFolderSortToggle();
|
||||
const currentFolderId = this.getCurrentFolderIdForSort();
|
||||
|
||||
if (showPerFolderToggle) {
|
||||
const isSet = PerFolderSortOrderService.isSet(currentFolderId);
|
||||
buttons.push({
|
||||
text: `[ ${_('Use own sort order')} ]`,
|
||||
checked: isSet,
|
||||
id: { name: 'perFolderSortOrder', value: !isSet },
|
||||
});
|
||||
}
|
||||
|
||||
const r = await this.props.dialogManager.showMenu(Setting.settingMetadata('notes.sortOrder.field').label(), buttons);
|
||||
if (!r) return;
|
||||
|
||||
if (r.name === 'perFolderSortOrder') {
|
||||
PerFolderSortOrderService.set(currentFolderId, r.value as boolean);
|
||||
} else if (r.name === 'notes.sortOrder.field' || r.name === 'notes.sortOrder.reverse') {
|
||||
Setting.setValue(r.name, r.value);
|
||||
// Update the appropriate sort order storage based on whether per-folder sort is enabled
|
||||
PerFolderSortOrderService.onSortOrderChange(currentFolderId);
|
||||
} else {
|
||||
Setting.setValue(r.name, r.value);
|
||||
}
|
||||
};
|
||||
|
||||
// Show "use own sort order" toggle for folders and the All Notes smart filter,
|
||||
// but not for tags, conflicts folder, or trash folder.
|
||||
private shouldShowPerFolderSortToggle(): boolean {
|
||||
const { notesParentType, selectedFolderId, selectedSmartFilterId } = this.props;
|
||||
|
||||
if (notesParentType === 'Folder') {
|
||||
return selectedFolderId !== Folder.conflictFolderId() && selectedFolderId !== getTrashFolderId();
|
||||
}
|
||||
|
||||
if (notesParentType === 'SmartFilter') {
|
||||
return selectedSmartFilterId === ALL_NOTES_FILTER_ID;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private getCurrentFolderIdForSort(): string {
|
||||
if (this.props.notesParentType === 'Folder') {
|
||||
return this.props.selectedFolderId;
|
||||
} else if (this.props.notesParentType === 'SmartFilter') {
|
||||
return this.props.selectedSmartFilterId;
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
public styles() {
|
||||
if (!this.styles_) this.styles_ = {};
|
||||
const themeId = this.props.themeId;
|
||||
const cacheKey = themeId;
|
||||
|
||||
if (this.styles_[cacheKey]) return this.styles_[cacheKey];
|
||||
this.styles_ = {};
|
||||
|
||||
const styles = {
|
||||
noteList: {
|
||||
flex: 1,
|
||||
},
|
||||
};
|
||||
|
||||
this.styles_[cacheKey] = StyleSheet.create(styles);
|
||||
return this.styles_[cacheKey];
|
||||
}
|
||||
|
||||
public async componentDidMount() {
|
||||
await this.refreshNotes();
|
||||
this.onAppStateChangeSub_ = RNAppState.addEventListener('change', this.onAppStateChange_);
|
||||
}
|
||||
|
||||
public async componentWillUnmount() {
|
||||
if (this.onAppStateChangeSub_) this.onAppStateChangeSub_.remove();
|
||||
}
|
||||
|
||||
public async componentDidUpdate(prevProps: Props) {
|
||||
if (prevProps.notesOrder !== this.props.notesOrder || prevProps.selectedFolderId !== this.props.selectedFolderId || prevProps.selectedTagId !== this.props.selectedTagId || prevProps.selectedSmartFilterId !== this.props.selectedSmartFilterId || prevProps.notesParentType !== this.props.notesParentType || prevProps.uncompletedTodosOnTop !== this.props.uncompletedTodosOnTop || prevProps.showCompletedTodos !== this.props.showCompletedTodos) {
|
||||
await this.refreshNotes(this.props);
|
||||
}
|
||||
}
|
||||
|
||||
public async refreshNotes(props: Props|null = null) {
|
||||
if (props === null) props = this.props;
|
||||
|
||||
const options = {
|
||||
order: props.notesOrder,
|
||||
uncompletedTodosOnTop: props.uncompletedTodosOnTop,
|
||||
showCompletedTodos: props.showCompletedTodos,
|
||||
caseInsensitive: true,
|
||||
};
|
||||
|
||||
const parent = this.parentItem(props);
|
||||
if (!parent) return;
|
||||
|
||||
const source = JSON.stringify({
|
||||
options: options,
|
||||
parentId: parent.id,
|
||||
});
|
||||
|
||||
if (source === props.notesSource) return;
|
||||
// For now, search refresh is handled by the search screen.
|
||||
if (props.notesParentType === 'Search') return;
|
||||
|
||||
let notes: NoteEntity[] = [];
|
||||
if (props.notesParentType === 'Folder') {
|
||||
notes = await Note.previews(props.selectedFolderId, options);
|
||||
} else if (props.notesParentType === 'Tag') {
|
||||
notes = await Tag.notes(props.selectedTagId, options);
|
||||
} else if (props.notesParentType === 'SmartFilter') {
|
||||
notes = await Note.previews(null, options);
|
||||
}
|
||||
|
||||
this.props.dispatch({
|
||||
type: 'NOTE_UPDATE_ALL',
|
||||
notes: notes,
|
||||
notesSource: source,
|
||||
});
|
||||
}
|
||||
|
||||
public newNoteNavigate = async (folderId: string, isTodo: boolean) => {
|
||||
try {
|
||||
const newNote = await Note.save({
|
||||
parent_id: folderId,
|
||||
is_todo: isTodo ? 1 : 0,
|
||||
}, { provisional: true });
|
||||
|
||||
this.props.dispatch({
|
||||
type: 'NAV_GO',
|
||||
routeName: 'Note',
|
||||
noteId: newNote.id,
|
||||
});
|
||||
} catch (error) {
|
||||
alert(_('Cannot create a new note: %s', error.message));
|
||||
}
|
||||
};
|
||||
|
||||
public parentItem(props: Props|null = null) {
|
||||
if (!props) props = this.props;
|
||||
|
||||
let output = null;
|
||||
if (props.notesParentType === 'Folder') {
|
||||
output = Folder.byId(props.folders, props.selectedFolderId);
|
||||
} else if (props.notesParentType === 'Tag') {
|
||||
output = Tag.byId(props.tags, props.selectedTagId);
|
||||
} else if (props.notesParentType === 'SmartFilter') {
|
||||
output = { id: this.props.selectedSmartFilterId, title: _('All notes') };
|
||||
} else {
|
||||
return null;
|
||||
// throw new Error('Invalid parent type: ' + props.notesParentType);
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
public folderPickerOptions() {
|
||||
const options = {
|
||||
visible: this.props.noteSelectionEnabled,
|
||||
mustSelect: true,
|
||||
};
|
||||
|
||||
if (this.folderPickerOptions_ && options.visible === this.folderPickerOptions_.visible) return this.folderPickerOptions_;
|
||||
|
||||
this.folderPickerOptions_ = options;
|
||||
return this.folderPickerOptions_;
|
||||
}
|
||||
|
||||
public render() {
|
||||
const parent = this.parentItem();
|
||||
const theme = themeStyle(this.props.themeId);
|
||||
|
||||
const rootStyle = this.props.visible ? theme.rootStyle : theme.hiddenRootStyle;
|
||||
|
||||
const title = parent ? parent.title : null;
|
||||
if (!parent) {
|
||||
return (
|
||||
<View style={rootStyle}>
|
||||
<ScreenHeader title={title} showSideMenuButton={true} showBackButton={false} />
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
const icon = Folder.unserializeIcon(parent.icon);
|
||||
const iconString = icon ? `${icon.emoji} ` : '';
|
||||
|
||||
let buttonFolderId = this.props.selectedFolderId !== Folder.conflictFolderId() ? this.props.selectedFolderId : null;
|
||||
if (!buttonFolderId) buttonFolderId = this.props.activeFolderId;
|
||||
|
||||
const addFolderNoteButtons = !!buttonFolderId;
|
||||
|
||||
const makeActionButtonComp = () => {
|
||||
if ((this.props.notesParentType === 'Folder' && itemIsInTrash(parent)) || !Folder.atLeastOneRealFolderExists(this.props.folders)) return null;
|
||||
|
||||
if (addFolderNoteButtons && this.props.folders.length > 0) {
|
||||
return <NewNoteButton />;
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
const actionButtonComp = this.props.noteSelectionEnabled || !this.props.visible ? null : makeActionButtonComp();
|
||||
|
||||
// Ensure that screen readers can't focus the notes list when it isn't visible.
|
||||
const accessibilityHidden = !this.props.visible;
|
||||
|
||||
return (
|
||||
<AccessibleView
|
||||
style={rootStyle}
|
||||
|
||||
inert={accessibilityHidden}
|
||||
>
|
||||
<ScreenHeader
|
||||
title={iconString + title}
|
||||
showBackButton={false}
|
||||
sortButton_press={this.sortButton_press}
|
||||
folderPickerOptions={this.folderPickerOptions()}
|
||||
showSearchButton={true}
|
||||
showSideMenuButton={true}
|
||||
/>
|
||||
<NoteList />
|
||||
{actionButtonComp}
|
||||
</AccessibleView>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
const NotesScreenWrapper: React.FC<Props> = props => {
|
||||
const dialogManager = useContext(DialogContext);
|
||||
return <NotesScreenComponent {...props} dialogManager={dialogManager}/>;
|
||||
};
|
||||
|
||||
const NotesScreen = connect((state: AppState) => {
|
||||
return {
|
||||
folders: state.folders,
|
||||
tags: state.tags,
|
||||
activeFolderId: state.settings.activeFolderId,
|
||||
selectedFolderId: state.selectedFolderId,
|
||||
selectedNoteIds: state.selectedNoteIds,
|
||||
selectedTagId: state.selectedTagId,
|
||||
selectedSmartFilterId: state.selectedSmartFilterId,
|
||||
notesParentType: state.notesParentType,
|
||||
notes: state.notes,
|
||||
notesSource: state.notesSource,
|
||||
uncompletedTodosOnTop: state.settings.uncompletedTodosOnTop,
|
||||
showCompletedTodos: state.settings.showCompletedTodos,
|
||||
themeId: state.settings.theme,
|
||||
noteSelectionEnabled: state.noteSelectionEnabled,
|
||||
notesOrder: stateUtils.notesOrder(state.settings),
|
||||
};
|
||||
})(NotesScreenWrapper);
|
||||
|
||||
export default NotesScreen;
|
||||
在新工单中引用
屏蔽一个用户