diff options
| author | bobzel <zzzman@gmail.com> | 2023-05-13 11:44:36 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2023-05-13 11:44:36 -0400 |
| commit | 0849fbd97c61688d51e5fea6cf8edc47989df5de (patch) | |
| tree | 422bf02e72429f0d77b5cd885274a8a74aa731ea /src/client/views/collections/CollectionCarouselView.tsx | |
| parent | dca61505ba138eef3819b16b760ec81becf9329e (diff) | |
fixed caption scrolling in carousel view. fixed display of audio tags in textboxes. fixed screengrab video upload and made dictation view possible (but needs reworking)
Diffstat (limited to 'src/client/views/collections/CollectionCarouselView.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionCarouselView.tsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/views/collections/CollectionCarouselView.tsx b/src/client/views/collections/CollectionCarouselView.tsx index 0e4556eb4..02f925bea 100644 --- a/src/client/views/collections/CollectionCarouselView.tsx +++ b/src/client/views/collections/CollectionCarouselView.tsx @@ -4,7 +4,7 @@ import { observer } from 'mobx-react'; import * as React from 'react'; import { Doc, Opt } from '../../../fields/Doc'; import { NumCast, ScriptCast, StrCast } from '../../../fields/Types'; -import { emptyFunction, returnFalse, returnZero } from '../../../Utils'; +import { emptyFunction, returnFalse, returnZero, StopEvent } from '../../../Utils'; import { DragManager } from '../../util/DragManager'; import { DocumentView, DocumentViewProps } from '../nodes/DocumentView'; import { FormattedTextBox } from '../nodes/formattedText/FormattedTextBox'; @@ -73,6 +73,7 @@ export class CollectionCarouselView extends CollectionSubView() { <div className="collectionCarouselView-caption" key="caption" + onWheel={StopEvent} style={{ display: showCaptions ? undefined : 'none', borderRadius: this.props.styleProvider?.(this.layoutDoc, captionProps, StyleProp.BorderRounding), @@ -80,7 +81,7 @@ export class CollectionCarouselView extends CollectionSubView() { marginLeft: marginX, width: `calc(100% - ${marginX * 2}px)`, }}> - <FormattedTextBox key={index} {...captionProps} fieldKey={showCaptions} styleProvider={this.captionStyleProvider} Document={curDoc.layout} DataDoc={undefined} /> + <FormattedTextBox key={index} {...captionProps} allowScroll={true} fieldKey={showCaptions} styleProvider={this.captionStyleProvider} Document={curDoc.layout} DataDoc={undefined} /> </div> </> ); |
