fix: always show the home compose box (#1109)
* fix: always show the home compose box fixes #1076 * fix loading visibility
This commit is contained in:
parent
f0af8178af
commit
2e8e0a5f19
|
@ -7,9 +7,7 @@
|
||||||
{#if hidePage}
|
{#if hidePage}
|
||||||
<LoadingPage />
|
<LoadingPage />
|
||||||
{/if}
|
{/if}
|
||||||
{#if $currentVerifyCredentials }
|
<ComposeBox realm="home" hidden={hidePage}/>
|
||||||
<ComposeBox realm="home" hidden={hidePage}/>
|
|
||||||
{/if}
|
|
||||||
<div class="timeline-home-anchor-container">
|
<div class="timeline-home-anchor-container">
|
||||||
{#if !hidePage && hideTimeline}
|
{#if !hidePage && hideTimeline}
|
||||||
<LoadingPage />
|
<LoadingPage />
|
||||||
|
|
|
@ -1,13 +1,18 @@
|
||||||
<a href="/accounts/{verifyCredentials.id}"
|
<a {href}
|
||||||
rel="prefetch"
|
rel="prefetch"
|
||||||
class="compose-box-avatar"
|
class="compose-box-avatar {loaded ? 'loaded' : 'not-loaded'}"
|
||||||
|
aria-hidden={!loaded}
|
||||||
aria-label="Profile for {accessibleName}">
|
aria-label="Profile for {accessibleName}">
|
||||||
<Avatar account={verifyCredentials} size="small"/>
|
<Avatar account={verifyCredentials} size="small"/>
|
||||||
</a>
|
</a>
|
||||||
<a class="compose-box-display-name" href="/accounts/{verifyCredentials.id}" rel="prefetch">
|
<a class="compose-box-display-name {loaded ? 'loaded' : 'not-loaded'}"
|
||||||
|
{href}
|
||||||
|
aria-hidden={!loaded}
|
||||||
|
rel="prefetch">
|
||||||
<AccountDisplayName account={verifyCredentials} />
|
<AccountDisplayName account={verifyCredentials} />
|
||||||
</a>
|
</a>
|
||||||
<span class="compose-box-handle">
|
<span class="compose-box-handle {loaded ? 'loaded' : 'not-loaded'}"
|
||||||
|
aria-hidden={!loaded} >
|
||||||
{'@' + verifyCredentials.acct}
|
{'@' + verifyCredentials.acct}
|
||||||
</span>
|
</span>
|
||||||
<style>
|
<style>
|
||||||
|
@ -41,6 +46,12 @@
|
||||||
font-size: 1.1em;
|
font-size: 1.1em;
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
}
|
}
|
||||||
|
.not-loaded {
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
|
.loaded {
|
||||||
|
visibility: visible;
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 767px) {
|
@media (max-width: 767px) {
|
||||||
.compose-box-avatar {
|
.compose-box-avatar {
|
||||||
|
@ -54,6 +65,7 @@
|
||||||
import { store } from '../../_store/store'
|
import { store } from '../../_store/store'
|
||||||
import AccountDisplayName from '../profile/AccountDisplayName.html'
|
import AccountDisplayName from '../profile/AccountDisplayName.html'
|
||||||
import { removeEmoji } from '../../_utils/removeEmoji'
|
import { removeEmoji } from '../../_utils/removeEmoji'
|
||||||
|
import { ONE_TRANSPARENT_PIXEL } from '../../_static/media'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
|
@ -62,14 +74,26 @@
|
||||||
},
|
},
|
||||||
store: () => store,
|
store: () => store,
|
||||||
computed: {
|
computed: {
|
||||||
verifyCredentials: ({ $currentVerifyCredentials }) => $currentVerifyCredentials,
|
loaded: ({ $currentVerifyCredentials }) => !!$currentVerifyCredentials,
|
||||||
|
verifyCredentials: ({ $currentVerifyCredentials }) => {
|
||||||
|
// return a placeholder while we're waiting on IndexedDB to load
|
||||||
|
// (https://github.com/nolanlawson/pinafore/issues/1076)
|
||||||
|
return $currentVerifyCredentials || {
|
||||||
|
display_name: '',
|
||||||
|
acct: '',
|
||||||
|
avatar: ONE_TRANSPARENT_PIXEL,
|
||||||
|
avatar_static: ONE_TRANSPARENT_PIXEL
|
||||||
|
}
|
||||||
|
},
|
||||||
|
id: ({ verifyCredentials }) => (verifyCredentials && verifyCredentials.id),
|
||||||
|
href: ({ id }) => (id ? `/accounts/${id}` : '#'),
|
||||||
emojis: ({ verifyCredentials }) => (verifyCredentials.emojis || []),
|
emojis: ({ verifyCredentials }) => (verifyCredentials.emojis || []),
|
||||||
displayName: ({ verifyCredentials }) => verifyCredentials.display_name || verifyCredentials.username,
|
displayName: ({ verifyCredentials }) => verifyCredentials.display_name || verifyCredentials.username,
|
||||||
accessibleName: ({ displayName, emojis, $omitEmojiInDisplayNames }) => {
|
accessibleName: ({ displayName, emojis, $omitEmojiInDisplayNames }) => {
|
||||||
if ($omitEmojiInDisplayNames) {
|
if ($omitEmojiInDisplayNames) {
|
||||||
return removeEmoji(displayName, emojis) || displayName
|
return removeEmoji(displayName, emojis) || displayName || ''
|
||||||
}
|
}
|
||||||
return displayName
|
return displayName || ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,7 +155,9 @@
|
||||||
media: ({ composeData }) => composeData.media || [],
|
media: ({ composeData }) => composeData.media || [],
|
||||||
inReplyToId: ({ composeData }) => composeData.inReplyToId,
|
inReplyToId: ({ composeData }) => composeData.inReplyToId,
|
||||||
postPrivacy: ({ postPrivacyKey }) => POST_PRIVACY_OPTIONS.find(_ => _.key === postPrivacyKey),
|
postPrivacy: ({ postPrivacyKey }) => POST_PRIVACY_OPTIONS.find(_ => _.key === postPrivacyKey),
|
||||||
defaultPostPrivacyKey: ({ $currentVerifyCredentials }) => $currentVerifyCredentials.source.privacy,
|
defaultPostPrivacyKey: ({ $currentVerifyCredentials }) => (
|
||||||
|
($currentVerifyCredentials && $currentVerifyCredentials.source.privacy) || 'public'
|
||||||
|
),
|
||||||
postPrivacyKey: ({ composeData, defaultPostPrivacyKey }) => composeData.postPrivacy || defaultPostPrivacyKey,
|
postPrivacyKey: ({ composeData, defaultPostPrivacyKey }) => composeData.postPrivacy || defaultPostPrivacyKey,
|
||||||
textLength: ({ text }) => measureText(text),
|
textLength: ({ text }) => measureText(text),
|
||||||
contentWarningLength: ({ contentWarning }) => measureText(contentWarning),
|
contentWarningLength: ({ contentWarning }) => measureText(contentWarning),
|
||||||
|
|
Loading…
Reference in New Issue