Skip to content

Commit

Permalink
Merge branch 'main' into 435-basic-list-
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/renderer/components/docking/platform-dock-layout.component.tsx
  • Loading branch information
rolfheij-sil committed Oct 18, 2023
2 parents 6553696 + e04d763 commit 045da22
Show file tree
Hide file tree
Showing 50 changed files with 1,897 additions and 403 deletions.
6 changes: 6 additions & 0 deletions extensions/src/hello-someone/hello-someone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,12 @@ export async function activate(context: ExecutionActivationContext): Promise<voi
await peopleWebViewProviderPromise,
await helloSomeoneCommandPromise,
await echoSomeoneRendererPromise,
papi.webViews.onDidAddWebView((addWebViewEvent) => {
if (addWebViewEvent.webView.webViewType === peopleWebViewType)
logger.info(
`We noticed a ${peopleWebViewType} webView was added with id ${addWebViewEvent.webView.id}`,
);
}),
);

logger.info('Hello Someone is finished activating!');
Expand Down
4 changes: 4 additions & 0 deletions extensions/src/hello-someone/hello-someone.web-view.html
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@
newWebViewButton.addEventListener('click', async () => {
const webViewId = await papi.webViews.getWebView('helloSomeone.peopleViewer', {
type: 'float',
floatSize: {
width: 450,
height: 350,
},
});
print(`New People webview id: ${webViewId}`);
});
Expand Down
155 changes: 155 additions & 0 deletions extensions/src/hello-world/assets/offline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions extensions/src/hello-world/hello-world.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const reactWebViewProvider: IWebViewProviderWithType = {
);
return {
...savedWebView,
iconUrl: 'papi-extension://hello-world/assets/offline.svg',
title: 'Hello World React',
content: helloWorldReactWebView,
styles: helloWorldReactWebViewStyles,
Expand Down
19 changes: 17 additions & 2 deletions extensions/src/hello-world/web-views/hello-world.web-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ import {
import type { QuickVerseDataTypes } from 'quick-verse';
import type { PeopleDataProvider, PeopleDataTypes } from 'hello-someone';
import type { UsfmProviderDataTypes } from 'usfm-data-provider';
import { Key, useCallback, useContext, useMemo, useState } from 'react';
import { Key, useCallback, useContext, useMemo, useRef, useState } from 'react';
import type { HelloWorldEvent } from 'hello-world';
import type { DialogTypes } from 'renderer/components/dialogs/dialog.data';
import Clock from './components/clock.component';

type Row = {
Expand All @@ -27,7 +28,7 @@ type Row = {
const {
react: {
context: { TestContext },
hooks: { useData, useDataProvider, usePromise, useEvent, useSetting },
hooks: { useData, useDataProvider, usePromise, useEvent, useSetting, useDialogCallback },
},
logger,
} = papi;
Expand Down Expand Up @@ -85,6 +86,16 @@ globalThis.webViewComponent = function HelloWorld() {
'retrieving',
);

const [project, selectProject] = useDialogCallback(
'platform.selectProject',
useRef({
prompt: 'Please select a project for Hello World WebView:',
iconUrl: 'papi-extension://hello-world/assets/offline.svg',
title: 'Select Hello World Project',
}).current,
'None' as DialogTypes['platform.selectProject']['responseType'],
);

const [latestVerseText] = useData.Verse<QuickVerseDataTypes, 'Verse'>(
'quickVerse.quickVerse',
'latest',
Expand Down Expand Up @@ -152,6 +163,10 @@ globalThis.webViewComponent = function HelloWorld() {
</div>
<div>{personGreeting}</div>
<div>{personAge}</div>
<div>Selected Project: {project}</div>
<div>
<Button onClick={selectProject}>Select Project</Button>
</div>
<h3>John 1:1</h3>
<div>{john11}</div>
<h3>Psalm 1</h3>
Expand Down
32 changes: 16 additions & 16 deletions extensions/src/resource-viewer/resource-viewer.web-view.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { VerseRef } from '@sillsdev/scripture';
import { VerseRef } from '@sillsdev/scripture';
import papi from 'papi-frontend';
import { ScriptureReference } from 'papi-components';
import { useMemo } from 'react';
import { JSX, useMemo } from 'react';
// eslint-disable-next-line import/no-unresolved
import { UsfmProviderDataTypes } from 'usfm-data-provider';
import UsxEditor from 'usxeditor';
Expand All @@ -24,8 +24,15 @@ interface ElementInfo {
validStyles?: StyleInfo[];
}

const {
react: {
hooks: { useData, useSetting },
},
logger,
} = papi;

/** All available elements for use in slate editor */
const EditorElements: { [type: string]: ElementInfo } = {
const editorElements: { [type: string]: ElementInfo } = {
verse: {
inline: true,
validStyles: [{ style: 'v', oneWord: true }],
Expand Down Expand Up @@ -109,9 +116,9 @@ const EditorElements: { [type: string]: ElementInfo } = {
},
};

const UsxEditorParaMap = EditorElements.para.validStyles?.map((style) => style.style) || [];
const UsxEditorCharMap = Object.fromEntries(
EditorElements.char.validStyles?.map((style) => [style.style, {}]) || [],
const usxEditorParaMap = editorElements.para.validStyles?.map((style) => style.style) || [];
const usxEditorCharMap = Object.fromEntries(
editorElements.char.validStyles?.map((style) => [style.style, {}]) || [],
);

interface ScriptureTextPanelUsxProps {
Expand All @@ -134,8 +141,8 @@ function ScriptureTextPanelUsxEditor({ usx }: ScriptureTextPanelUsxProps) {
<div className="text-panel">
<UsxEditor
usx={usx}
paraMap={UsxEditorParaMap}
charMap={UsxEditorCharMap}
paraMap={usxEditorParaMap}
charMap={usxEditorCharMap}
onUsxChanged={() => {
/* Read only */
}}
Expand All @@ -144,14 +151,7 @@ function ScriptureTextPanelUsxEditor({ usx }: ScriptureTextPanelUsxProps) {
);
}

const {
react: {
hooks: { useData, useSetting },
},
logger,
} = papi;

globalThis.webViewComponent = function ResourceViewer() {
globalThis.webViewComponent = function ResourceViewer(): JSX.Element {
logger.info('Preparing to display the Resource Viewer');

const [scrRef] = useSetting('platform.verseRef', defaultScrRef);
Expand Down
Loading

0 comments on commit 045da22

Please sign in to comment.